##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

convert/mtn: handle new files in moved directories (issue1619)...
convert/mtn: handle new files in moved directories (issue1619) Reported and investigated by Paul Aurich <paul@darkrain42.org>
Patrick Mezard - - Load All Authors

File last commit:

r5408:36794dbe default
r8099:3cdf4872 default
Show More
test-merge-symlinks.out
17 lines | 497 B | text/plain | TextLexer
/ tests / test-merge-symlinks.out
History | Source | Raw |Copy content |Copy permalink
Patrick Mezard
Test workingctx exec/link bit for copies....
 r5408 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
Patrick Mezard
Test *_ISLINK merge environment vars
 r5391 % merge heads
Patrick Mezard
Test workingctx exec/link bit for copies....
 r5408 HG_FILE l
Patrick Mezard
Test *_ISLINK merge environment vars
 r5391 HG_MY_ISLINK 1
HG_OTHER_ISLINK 0
HG_BASE_ISLINK 0
merging l
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
Patrick Mezard
Test workingctx exec/link bit for copies....
 r5408 % merge working directory
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
HG_FILE l2
HG_MY_ISLINK 1
HG_OTHER_ISLINK 0
HG_BASE_ISLINK 0
merging l2
0 files updated, 1 files merged, 0 files removed, 0 files unresolved