Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-bad-pull.out @ 5483:0c43f87baba3 default tip
Fix file-changed-to-dir and dir-to-file commits (issue660).
Allow adding to dirstate files that clash with previously existing
but marked for removal. Protect from reintroducing clashes by revert.
This change doesn't address related issues with update. Current
workaround is to do "clean" update by manually removing conflicting
files/dirs from working directory.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Sat, 27 Oct 2007 16:27:55 +0400 |
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 |