Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-update-reverse @ 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 | 7544700fd931 |
children |
line wrap: on
line source
#!/bin/sh hg init touch a hg add a hg commit -m "Added a" -d "1000000 0" touch main hg add main hg commit -m "Added main" -d "1000000 0" hg checkout 0 echo Main should be gone ls touch side1 hg add side1 hg commit -m "Added side1" -d "1000000 0" touch side2 hg add side2 hg commit -m "Added side2" -d "1000000 0" hg log echo Should have two heads, side2 and main hg heads echo Should show "a side1 side2" ls hg update --debug -C 1 echo Should only show "a main" ls