view tests/test-convert-hg-sink.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.

changeset:   3:593cbf6fb2b4
tag:         tip
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     Added tag some-tag for changeset ad681a868e44

changeset:   2:ad681a868e44
tag:         some-tag
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     add foo/file

changeset:   1:cbba8ecc03b7
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     remove foo

changeset:   0:327daa9251fa
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     add foo and bar

initializing destination new repository
scanning source...
sorting...
converting...
3 add foo and bar
2 remove foo
1 add foo/file
0 Added tag some-tag for changeset ad681a868e44
comparing with ../orig
searching for changes
no changes found
% dirstate should be empty:
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
% put something in the dirstate:
a   0         -1 unset             baz
copy: bar -> baz
% add a new revision in the original repo
destination new is a Mercurial repository
scanning source...
sorting...
converting...
0 add baz
comparing with ../orig
searching for changes
no changes found
% dirstate should be the same (no output below):
% no copies
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
baz not renamed