Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-addremove-similar @ 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 | 8d982aef0be1 |
| children |
line wrap: on
line source
#!/bin/sh hg init rep; cd rep touch empty-file python -c 'for x in range(10000): print x' > large-file hg addremove hg commit -m A rm large-file empty-file python -c 'for x in range(10,10000): print x' > another-file hg addremove -s50 hg commit -m B echo % comparing two empty files caused ZeroDivisionError in the past hg update -C 0 rm empty-file touch another-empty-file hg addremove -s50 cd .. hg init rep2; cd rep2 python -c 'for x in range(10000): print x' > large-file python -c 'for x in range(50): print x' > tiny-file hg addremove hg commit -m A python -c 'for x in range(70): print x' > small-file rm tiny-file rm large-file hg addremove -s50 hg commit -m B echo % should all fail hg addremove -s foo hg addremove -s -1 hg addremove -s 1e6 true