diff tests/test-copy-move-merge @ 5059:8d9bdcbb2b18

merge: avoid double deletion mentioned in issue636
author Matt Mackall <mpm@selenic.com>
date Thu, 02 Aug 2007 12:29:10 -0500
parents
children
line wrap: on
line diff
new file mode 100755
--- /dev/null
+++ b/tests/test-copy-move-merge
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+mkdir t
+cd t
+hg init
+
+echo 1 > a
+hg ci -qAm "first" -d "1000000 0"
+
+hg cp a b
+hg mv a c
+echo 2 >> b
+echo 2 >> c
+
+hg ci -qAm "second" -d "1000000 0"
+
+hg co -C 0
+
+echo 0 > a
+echo 1 >> a
+
+hg ci -qAm "other" -d "1000000 0"
+
+hg merge --debug
+
+echo "-- b --"
+cat b
+
+echo "-- c --"
+cat c