Mercurial > hg

diff tests/test-issue612 @ 4819:9797124581c9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: fix adding untracked files on directory rename (issue612) Fix from Brendan Added test case
author Matt Mackall <mpm@selenic.com>
date Thu, 05 Jul 2007 16:01:07 -0500
parents
children 4c94b6d0fb1c
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-issue612	Thu Jul 05 16:01:07 2007 -0500
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+mkdir t
+cd t
+
+hg init
+mkdir src
+echo a > src/a.c
+hg ci -Ama -d "10000000 0"
+
+hg mv src source
+hg ci -Ammove -d "1000000 0"
+
+hg co -C 0
+echo new > src/a.c
+echo compiled > src/a.o
+hg ci -mupdate -d "1000000 0"
+
+hg st
+
+hg merge
+
+hg st
+