Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-impexp-branch.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 | d9d177ef748a |
children |
rev | line source |
---|---|
4602
d9d177ef748a
Fix up tests for new branch message
Brendan Cully <brendan@kublai.com>
parents:
4441
diff
changeset
|
1 marked working directory as branch abranch |
4439
871ff96a86cc
Add a test for the Branch header being in hg export.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
2 applying patch from stdin |
871ff96a86cc
Add a test for the Branch header being in hg export.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
3 applying patch from stdin |
4441
32ea809e5bd1
Alter test to test import --exact to make sure it works with branches.
Eric Hopper <hopper@omnifarious.org>
parents:
4439
diff
changeset
|
4 applying patch from stdin |
32ea809e5bd1
Alter test to test import --exact to make sure it works with branches.
Eric Hopper <hopper@omnifarious.org>
parents:
4439
diff
changeset
|
5 applying patch from stdin |