Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-bad-pull.out @ 3387:ba7c74081861
merge: update dirstate correctly for non-branchmerge updates
- we don't actually need the context in recordupdates
- use -1 for filesize to force check on normal update
- only record copy for branchmerges
- forget moved files on update
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 13 Oct 2006 17:58:04 -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 |