diff tests/test-mq-merge.t @ 15775:91eb4512edd0

copies: rewrite copy detection for non-merge users The existing copy detection API was designed with merge in mind and was ill-suited for doing status/diff. The new pathcopies implementation gives more accurate, easier to use results for comparing two revisions, and is much simpler to understand. Test notes: - test-mv-cp-st.t results finds more renames in the reverse direction now - test-mq-merge.t was always wrong and duplicated a copy in diff that was already present in one of the parent revisions
author Matt Mackall <mpm@selenic.com>
date Wed, 04 Jan 2012 17:55:30 -0600
parents 9910f60a37ee
children 0e0060bf2f44
line wrap: on
line diff
--- a/tests/test-mq-merge.t	Wed Jan 04 15:48:02 2012 -0600
+++ b/tests/test-mq-merge.t	Wed Jan 04 17:55:30 2012 -0600
@@ -149,13 +149,11 @@
   -b
   +a
   +c
-  diff --git a/a b/aa
-  copy from a
-  copy to aa
-  --- a/a
+  diff --git a/aa b/aa
+  new file mode 100644
+  --- /dev/null
   +++ b/aa
-  @@ -1,1 +1,1 @@
-  -b
+  @@ -0,0 +1,1 @@
   +a
 
 Check patcha2 is still a regular patch: