Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-merge10.out @ 4696:59b8f9361545

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: add merge test for changeset 9fe267f77f56 When all the files in a directory are moved somewhere else, and new files are added in changesets of the local branch, a subsequent pull and merge shouldn't rename the locally added files too.
author Giorgos Keramidas <keramida@ceid.upatras.gr>
date Sat, 23 Jun 2007 22:43:46 -0500
parents
children
line wrap: on
line diff
new file mode 100644
--- /dev/null
+++ b/tests/test-merge10.out
@@ -0,0 +1,19 @@
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+pulling from ../a
+searching for changes
+adding changesets
+adding manifests
+adding file changes
+added 1 changesets with 1 changes to 1 files (+1 heads)
+(run 'hg heads' to see heads, 'hg merge' to merge)
+0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+merging testdir/subdir/a and testdir/a
+0 files updated, 1 files merged, 0 files removed, 0 files unresolved
+(branch merge, don't forget to commit)
+M testdir/subdir/a
+diff -r d02b3fc32762 testdir/subdir/a
+--- a/testdir/subdir/a
++++ b/testdir/subdir/a
+@@ -1,1 +1,1 @@ a
+-a
++alpha