Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-rename-dir-merge2 @ 4117:c95060a5391a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: fix renaming of subdirectories under renamed directories
author Matt Mackall <mpm@selenic.com>
date Tue, 27 Feb 2007 16:20:06 -0600
parents
children
line wrap: on
line diff
new file mode 100755
--- /dev/null
+++ b/tests/test-rename-dir-merge2
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+mkdir r1
+cd r1
+hg init
+mkdir a
+echo foo > a/f
+hg add a
+hg ci -m "a/f == foo"
+cd ..
+
+hg clone r1 r2
+cd r2
+hg mv a b
+echo foo1 > b/f
+hg ci -m" a -> b, b/f == foo1"
+cd ..
+
+cd r1
+mkdir a/aa
+echo bar > a/aa/g
+hg add a/aa
+hg ci -m "a/aa/g"
+hg pull ../r2
+
+hg merge
+
+hg st -C