Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert cfebb175704f, fixing the output of 2 tests
authorAlexis S. L. Carvalho <alexis@cecm.usp.br>
Sat, 15 Mar 2008 22:03:18 -0300
changeset 6283 5a45c82fc7da
parent 6282 709652cd7bff
child 6284 c93b6c0e6e84
Revert cfebb175704f, fixing the output of 2 tests
mercurial/copies.py file | annotate | diff | comparison | revisions
tests/test-git-export.out file | annotate | diff | comparison | revisions
tests/test-up-local-change.out file | annotate | diff | comparison | revisions 
--- a/mercurial/copies.py	Sat Mar 15 22:03:18 2008 -0300
+++ b/mercurial/copies.py	Sat Mar 15 22:03:18 2008 -0300
@@ -68,7 +68,7 @@
     pr = repo.changelog.parentrevs
     def parents(rev):
         return [p for p in pr(rev) if p != nullrev]
-    limit = min(ancestor.symmetricdifference(rev1, rev2, parents) + [rev1, rev2])
+    limit = min(ancestor.symmetricdifference(rev1, rev2, parents))
     m1 = c1.manifest()
     m2 = c2.manifest()
     ma = ca.manifest()
--- a/tests/test-git-export.out	Sat Mar 15 22:03:18 2008 -0300
+++ b/tests/test-git-export.out	Sat Mar 15 22:03:18 2008 -0300
@@ -12,15 +12,9 @@
 copy from new
 copy to copy
 % rename
-diff --git a/copy b/copy
-deleted file mode 100644
---- a/copy
-+++ /dev/null
-@@ -1,1 +0,0 @@
--new
-diff --git a/new b/rename
-copy from new
-copy to rename
+diff --git a/copy b/rename
+rename from copy
+rename to rename
 % delete
 diff --git a/rename b/rename
 deleted file mode 100644
--- a/tests/test-up-local-change.out	Sat Mar 15 22:03:18 2008 -0300
+++ b/tests/test-up-local-change.out	Sat Mar 15 22:03:18 2008 -0300
@@ -17,7 +17,7 @@
 resolving manifests
  overwrite False partial False
  ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299
-  searching for copies back to rev 0
+  searching for copies back to rev 1
   unmatched files in other:
    b
  a: versions differ -> m
@@ -54,7 +54,7 @@
 resolving manifests
  overwrite False partial False
  ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299
-  searching for copies back to rev 0
+  searching for copies back to rev 1
   unmatched files in other:
    b
  a: versions differ -> m
Mercurial