Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-bad-pull.out @ 3295:764688cf51e5
merge: remember rename copies and parents properly on commit
record copies in dirstate even if rename was remote
this lets us record it properly at commit
teach checkfilemerge about copies, including merge cases
pull old copy code out of commit
extend rename-merge1 test to show file index
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 08 Oct 2006 19:57:45 -0500 |
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 |