Show More
@@ -151,7 +151,7 b' def _backwardrenames(a, b):' | |||||
151 | # arbitrarily pick one of the renames. |
|
151 | # arbitrarily pick one of the renames. | |
152 | f = _forwardcopies(b, a) |
|
152 | f = _forwardcopies(b, a) | |
153 | r = {} |
|
153 | r = {} | |
154 | for k, v in f.iteritems(): |
|
154 | for k, v in sorted(f.iteritems()): | |
155 | # remove copies |
|
155 | # remove copies | |
156 | if v in a: |
|
156 | if v in a: | |
157 | continue |
|
157 | continue |
@@ -337,12 +337,12 b' One file is copied to many destinations ' | |||||
337 | Reversed: |
|
337 | Reversed: | |
338 |
|
338 | |||
339 | $ hg diff --git -r -1 -r -2 |
|
339 | $ hg diff --git -r -1 -r -2 | |
340 | diff --git a/brand-new3 b/brand-new2 |
|
340 | diff --git a/brand-new3-2 b/brand-new2 | |
341 | rename from brand-new3 |
|
341 | rename from brand-new3-2 | |
342 | rename to brand-new2 |
|
342 | rename to brand-new2 | |
343 |
diff --git a/brand-new3 |
|
343 | diff --git a/brand-new3 b/brand-new3 | |
344 | deleted file mode 100644 |
|
344 | deleted file mode 100644 | |
345 |
--- a/brand-new3 |
|
345 | --- a/brand-new3 | |
346 | +++ /dev/null |
|
346 | +++ /dev/null | |
347 | @@ -1,1 +0,0 @@ |
|
347 | @@ -1,1 +0,0 @@ | |
348 | - |
|
348 | - |
General Comments 0
You need to be logged in to leave comments.
Login now