Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-clone-failure.out @ 5483:0c43f87baba3 default tip
Fix file-changed-to-dir and dir-to-file commits (issue660).
Allow adding to dirstate files that clash with previously existing
but marked for removal. Protect from reintroducing clashes by revert.
This change doesn't address related issues with update. Current
workaround is to do "clean" update by manually removing conflicting
files/dirs from working directory.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Sat, 27 Oct 2007 16:27:55 +0400 |
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 |