Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-impexp-branch.out @ 5483:0c43f87baba3 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix file-changed-to-dir and dir-to-file commits (issue660). Allow adding to dirstate files that clash with previously existing but marked for removal. Protect from reintroducing clashes by revert. This change doesn't address related issues with update. Current workaround is to do "clean" update by manually removing conflicting files/dirs from working directory.
author Maxim Dounin <mdounin@mdounin.ru>
date Sat, 27 Oct 2007 16:27:55 +0400
parents d9d177ef748a
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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