view tests/test-status.out @ 5390:36c46e20976a

merge: provide *_ISLINK environment vars to merge helper Sets HG_MY_ISLINK, HG_OTHER_ISLINK, HG_BASE_ISLINK in environment. Without these variables, it's impossible for the merge application to know whether the 'other' and 'base' files were symlinks in their original contexts. For the purposes of the merge they are always emitted as small text files.
author Patrick Mezard <pmezard@gmail.com>
date Wed, 03 Oct 2007 23:09:36 +0200
parents a7b61c3b0f93
children
line wrap: on
line source

hg status in repo root:
? a/1/in_a_1
? a/in_a
? b/1/in_b_1
? b/2/in_b_2
? b/in_b
? in_root
hg status . in repo root:
? a/1/in_a_1
? a/in_a
? b/1/in_b_1
? b/2/in_b_2
? b/in_b
? in_root
hg status in a:
? a/1/in_a_1
? a/in_a
? b/1/in_b_1
? b/2/in_b_2
? b/in_b
? in_root
hg status . in a:
? 1/in_a_1
? in_a
hg status .. in a:
? 1/in_a_1
? in_a
? ../b/1/in_b_1
? ../b/2/in_b_2
? ../b/in_b
? ../in_root
hg status in b:
? a/1/in_a_1
? a/in_a
? b/1/in_b_1
? b/2/in_b_2
? b/in_b
? in_root
hg status . in b:
? 1/in_b_1
? 2/in_b_2
? in_b
hg status .. in b:
? ../a/1/in_a_1
? ../a/in_a
? 1/in_b_1
? 2/in_b_2
? in_b
? ../in_root
hg status in a/1:
? a/1/in_a_1
? a/in_a
? b/1/in_b_1
? b/2/in_b_2
? b/in_b
? in_root
hg status . in a/1:
? in_a_1
hg status .. in a/1:
? in_a_1
? ../in_a
hg status in b/1:
? a/1/in_a_1
? a/in_a
? b/1/in_b_1
? b/2/in_b_2
? b/in_b
? in_root
hg status . in b/1:
? in_b_1
hg status .. in b/1:
? in_b_1
? ../2/in_b_2
? ../in_b
hg status in b/2:
? a/1/in_a_1
? a/in_a
? b/1/in_b_1
? b/2/in_b_2
? b/in_b
? in_root
hg status . in b/2:
? in_b_2
hg status .. in b/2:
? ../1/in_b_1
? in_b_2
? ../in_b
adding .hgignore
adding deleted
adding modified
adding removed
hg status:
A added
R removed
! deleted
? unknown
hg status modified added removed deleted unknown never-existed ignored:
never-existed: No such file or directory
A added
R removed
! deleted
? ignored
? unknown
hg status -C:
A added
A copied
  modified
R removed
! deleted
? unknown
hg status -A:
A added
A copied
  modified
R removed
! deleted
? unknown
I ignored
C .hgignore
C modified