Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-bad-pull.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 | 5eb02f9ed804 |
children |
rev | line source |
---|---|
775 | 1 abort: error: Connection refused |
503
c6a2e41c8c60
Fix troubles with clone and exception handling
mpm@selenic.com
parents:
395
diff
changeset
|
2 255 |
1962
2a676ad52c22
tests: more portability fix for the old systems
TK Soh <teekaysoh@yahoo.com>
parents:
925
diff
changeset
|
3 copy: No such file or directory |
2438
a765f853439d
test-bad-pull: fix change in error output.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2108
diff
changeset
|
4 abort: HTTP Error 404 |
a765f853439d
test-bad-pull: fix change in error output.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2108
diff
changeset
|
5 0 |