Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-status @ 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 | a7b61c3b0f93 |
children |
line wrap: on
line source
#!/bin/sh hg init repo1 cd repo1 mkdir a b a/1 b/1 b/2 touch in_root a/in_a b/in_b a/1/in_a_1 b/1/in_b_1 b/2/in_b_2 echo "hg status in repo root:" hg status echo "hg status . in repo root:" hg status . for dir in a b a/1 b/1 b/2; do echo "hg status in $dir:" hg status --cwd "$dir" echo "hg status . in $dir:" hg status --cwd "$dir" . echo "hg status .. in $dir:" hg status --cwd "$dir" .. done cd .. hg init repo2 cd repo2 touch modified removed deleted ignored echo "ignored" > .hgignore hg ci -A -m 'initial checkin' -d "1000000 0" sleep 1 # make sure mtime is changed touch modified added unknown ignored hg add added hg remove removed rm deleted echo "hg status:" hg status echo "hg status modified added removed deleted unknown never-existed ignored:" hg status modified added removed deleted unknown never-existed ignored hg copy modified copied echo "hg status -C:" hg status -C echo "hg status -A:" hg status -A