Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-copy @ 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 | c0b449154a90 |
children |
line wrap: on
line source
#!/bin/sh hg init echo a > a hg add a hg commit -m "1" -d "1000000 0" hg status hg copy a b hg status hg --debug commit -m "2" -d "1000000 0" echo "we should see two history entries" hg history -v echo "we should see one log entry for a" hg log a echo "this should show a revision linked to changeset 0" hg debugindex .hg/store/data/a.i echo "we should see one log entry for b" hg log b echo "this should show a revision linked to changeset 1" hg debugindex .hg/store/data/b.i echo "this should show the rename information in the metadata" hg debugdata .hg/store/data/b.d 0 | head -3 | tail -2 $TESTDIR/md5sum.py .hg/store/data/b.i hg cat b > bsum $TESTDIR/md5sum.py bsum hg cat a > asum $TESTDIR/md5sum.py asum hg verify