Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-debugrename.out @ 5390:36c46e20976a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 5a088ac232e6
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4637
5a088ac232e6 Add test for debugrename
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
1 adding a
5a088ac232e6 Add test for debugrename
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
2 b renamed from a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
5a088ac232e6 Add test for debugrename
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
3 a renamed from b:9a263dd772e0159ddfa70fb8a448bb6c7ec8c69f
5a088ac232e6 Add test for debugrename
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
4 % test with --rev
5a088ac232e6 Add test for debugrename
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
5 b renamed from a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3