Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-locate @ 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 | a5cde03cd019 |
children |
line wrap: on
line source
#!/bin/sh hglocate() { echo "hg locate $@" hg locate "$@" ret=$? echo return $ret } mkdir t cd t hg init echo 0 > a echo 0 > b echo 0 > t.h mkdir t echo 0 > t/x echo 0 > t/b echo 0 > t/e.h mkdir dir.h echo 0 > dir.h/foo hg ci -A -m m -d "1000000 0" touch nottracked hglocate a && echo locate succeeded || echo locate failed hglocate NONEXISTENT && echo locate succeeded || echo locate failed hglocate hg rm a hg ci -m m -d "1000000 0" hglocate a hglocate NONEXISTENT hglocate relpath:NONEXISTENT hglocate hglocate -r 0 a hglocate -r 0 NONEXISTENT hglocate -r 0 relpath:NONEXISTENT hglocate -r 0 echo % -I/-X with relative path should work cd t hglocate hglocate -I ../t # test issue294 cd .. rm -r t hglocate 't/**' mkdir otherdir cd otherdir hglocate b hglocate '*.h' hglocate path:t/x hglocate 're:.*\.h$' hglocate -r 0 b hglocate -r 0 '*.h' hglocate -r 0 path:t/x hglocate -r 0 're:.*\.h$'