Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-clone-failure.out @ 5149: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 | aaeb7f5d1052 |
children |
rev | line source |
---|---|
1588
a679a364436a
Better error message (without /.hg appended) when repository is not found.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset
|
1 abort: repository a not found! |
550 | 2 255 |
775 | 3 abort: error: Connection refused |
550 | 4 255 |
1588
a679a364436a
Better error message (without /.hg appended) when repository is not found.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset
|
5 abort: repository a not found! |
550 | 6 255 |
7 abort: destination '../a' already exists | |
2057
fef2d653beaf
Never exit directly from commands.dispatch(), but pass return code to caller.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1588
diff
changeset
|
8 255 |
1588
a679a364436a
Better error message (without /.hg appended) when repository is not found.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset
|
9 abort: repository a not found! |
550 | 10 255 |
3841
aaeb7f5d1052
Show the destionation for clone if not specified manually.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2108
diff
changeset
|
11 destination directory: q |
550 | 12 abort: destination 'q' already exists |