Mercurial > hg

diff tests/test-mv-cp-st-diff.out @ 10179:83cfa1baf8ad stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copies: don't report copies with unrelated branch
author Patrick Mezard <pmezard@gmail.com>
date Fri, 01 Jan 2010 13:58:30 +0100
parents a3d73b3e1f8a
children
line wrap: on
line diff
--- a/tests/test-mv-cp-st-diff.out	Wed Dec 30 20:39:59 2009 -0200
+++ b/tests/test-mv-cp-st-diff.out	Fri Jan 01 13:58:30 2010 +0100
@@ -1234,3 +1234,21 @@
 +y1
 
 
+% testing copies with unrelated branch
+adding a
+0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+adding a
+created new head
+% unrelated branch diff
+diff --git a/a b/a
+deleted file mode 100644
+--- a/a
++++ /dev/null
+@@ -1,1 +0,0 @@
+-a
+diff --git a/b b/b
+new file mode 100644
+--- /dev/null
++++ b/b
+@@ -0,0 +1,1 @@
++a