Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-rebuildstate @ 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 | b304c2496f52 |
children |
line wrap: on
line source
#!/bin/sh # basic test for hg debugrebuildstate hg init repo cd repo touch foo bar hg ci -Am 'add foo bar' touch baz hg add baz hg rm bar echo '% state dump' hg debugstate | cut -b 1-16,35- | sort echo '% status' hg st -A hg debugrebuildstate echo '% state dump' hg debugstate | cut -b 1-16,35- | sort echo '% status' hg st -A