Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-rename-after-merge.out @ 5318:c6682cdada2f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Test renaming files brought by merge second parent (issue 746)
author Patrick Mezard <pmezard@gmail.com>
date Sun, 23 Sep 2007 14:40:44 +0200
parents
children
line wrap: on
line diff
new file mode 100644
--- /dev/null
+++ b/tests/test-rename-after-merge.out
@@ -0,0 +1,20 @@
+% create source repository
+adding a
+% fork source repository
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+adding b
+% update source repository
+% merge repositories
+pulling from ../t2
+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)
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+(branch merge, don't forget to commit)
+% rename b as c
+A c
+R b
+% rename back c as b