Mercurial > hg
annotate tests/test-clone-failure.out @ 6297:fed1a9c22076
dirstate.remove: during merges, remember the previous file state
We encode the previous state as a negative file size (AFAICS, previous
versions of hg always have size == 0 when state == 'r').
We save the state of 'm'erged and dirty files, because they're the
two states that indicate that a file has to be committed on a merge
to correctly record per-file history.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Tue, 18 Mar 2008 04:07:39 -0300 |
parents | aaeb7f5d1052 |
children | a218ba5f60df |
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 |