Mercurial > hg
annotate tests/test-rollback.out @ 5096:ad6b97132b81
merge: fix a copy detection bug (issue672)
When merging rev1 and rev2, we want to search for copies that happened
in rev1 but not in rev2 and vice-versa. We were starting the search at
rev1/rev2 and then going back, stopping as soon as we reached the revno
of the ancestor, but that can miss some cases (see the new
test-issue672).
Now we calculate the revisions that are ancestors of rev1 or rev2 (but
not both) and make sure the search doesn't stop too early.
Simplified test provided by mpm, based on a test case provided by
Edward Lee.
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Sun, 12 Aug 2007 12:15:10 -0300 |
| parents | 4f072bb06e89 |
| children | dd5a501cb97f |
| rev | line source |
|---|---|
| 336 | 1 checking changesets |
| 2 checking manifests | |
| 3 crosschecking files in changesets and manifests | |
| 4 checking files | |
| 5 1 files, 1 changesets, 1 total revisions | |
|
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
981
diff
changeset
|
6 changeset: 0:0acdaf898367 |
|
388
398737777644
Fixed tests for displaying tags in hg history and hg parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
382
diff
changeset
|
7 tag: tip |
| 336 | 8 user: test |
|
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
981
diff
changeset
|
9 date: Mon Jan 12 13:46:40 1970 +0000 |
| 336 | 10 summary: test |
| 11 | |
| 502 | 12 rolling back last transaction |
| 336 | 13 checking changesets |
| 14 checking manifests | |
| 15 crosschecking files in changesets and manifests | |
| 16 checking files | |
| 17 0 files, 0 changesets, 0 total revisions | |
| 18 A a |