tests/test-diffdir.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Fri, 14 Apr 2006 00:41:50 +0200
changeset 2065 2ff37e3bf780
parent 1933 7544700fd931
child 3825 000d122071b5
permissions -rw-r--r--
fix update when a locally added file match the target revision the dirstate entry for the added file wasn't updated. fix issue207

diff -r acd8075edac9 b
--- /dev/null
+++ b/b
@@ -0,0 +1,1 @@
+123
diff -r acd8075edac9 b
--- /dev/null
+++ b/b
@@ -0,0 +1,1 @@
+123
diff -r acd8075edac9 a
--- a/a
+++ b/a
@@ -0,0 +1,1 @@
+foo
diff -r acd8075edac9 b
--- /dev/null
+++ b/b
@@ -0,0 +1,1 @@
+123