Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-notfound.out @ 2548:0229ff95faec
Clarified message when nothing to merge is seen.
Sometimes there's a non-tip head waiting to be merged, especially after
pulling in remote changes while there were local modifications in the working
directory which had to be committed before 'hg merge' can work.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Mon, 03 Jul 2006 19:14:29 +0200 |
parents | 9462df772bc8 |
children |
rev | line source |
---|---|
909
e2e7a2462ede
Addes test for error messages when operating on non-existing files.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
1 Is there an error message when trying to diff non-existing files? |
e2e7a2462ede
Addes test for error messages when operating on non-existing files.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
2 found: No such file or directory |
e2e7a2462ede
Addes test for error messages when operating on non-existing files.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
3 not: No such file or directory |
1184
9462df772bc8
Fix up failing tests.
bos@serpentine.internal.keyresearch.com
parents:
925
diff
changeset
|
4 Is there an error message when trying to add non-existing files? |
909
e2e7a2462ede
Addes test for error messages when operating on non-existing files.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
5 found: No such file or directory |
1184
9462df772bc8
Fix up failing tests.
bos@serpentine.internal.keyresearch.com
parents:
925
diff
changeset
|
6 not: No such file or directory |