Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-pull-pull-corruption2 @ 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 | d181845bdc51 |
children |
line wrap: on
line source
#!/bin/sh # # Corrupt an hg repo with two pulls. # # create one repo with a long history hg init source1 cd source1 touch foo hg add foo for i in 1 2 3 4 5 6 7 8 9 10; do echo $i >> foo hg ci -m $i done cd .. # create a third repo to pull both other repos into it hg init version2 hg -R version2 pull source1 & sleep 1 hg clone --pull -U version2 corrupted wait hg -R corrupted verify hg -R version2 verify