Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-merge8 @ 3389:efbe24c7d8d9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates) (Test case created by Johannes Hofmann)
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 14 Oct 2006 10:53:29 +0200
parents
children
line wrap: on
line diff
new file mode 100755
--- /dev/null
+++ b/tests/test-merge8
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+# Test for changeset ba7c74081861
+# (update dirstate correctly for non-branchmerge updates)
+hg init a
+cd a
+echo a > a
+hg add a
+hg commit -m a
+cd ..
+hg clone a b
+cd a
+hg mv a b
+hg commit -m move
+echo b >> b
+hg commit -m b
+cd ../b
+hg pull ../a
+hg update