Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-bad-pull.out @ 5390:36c46e20976a
merge: provide *_ISLINK environment vars to merge helper
Sets HG_MY_ISLINK, HG_OTHER_ISLINK, HG_BASE_ISLINK in environment. Without these variables, it's impossible for the merge application to know whether the 'other' and 'base' files were symlinks in their original contexts. For the purposes of the merge they are always emitted as small text files.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Wed, 03 Oct 2007 23:09:36 +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 |