Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-locate.out @ 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
adding a adding b adding dir.h/foo adding t.h adding t/b adding t/e.h adding t/x hg locate a a locate succeeded hg locate NONEXISTENT locate failed hg locate a b dir.h/foo t.h t/b t/e.h t/x hg locate a hg locate NONEXISTENT hg locate relpath:NONEXISTENT hg locate b dir.h/foo t.h t/b t/e.h t/x hg locate -r 0 a a hg locate -r 0 NONEXISTENT hg locate -r 0 relpath:NONEXISTENT hg locate -r 0 a b dir.h/foo t.h t/b t/e.h t/x % -I/-X with relative path should work hg locate b dir.h/foo t.h t/b t/e.h t/x hg locate -I ../t t/b t/e.h t/x hg locate t/** t/b t/e.h t/x hg locate b ../b ../t/b hg locate *.h ../t.h ../t/e.h hg locate path:t/x ../t/x hg locate re:.*\.h$ ../t.h ../t/e.h hg locate -r 0 b ../b ../t/b hg locate -r 0 *.h ../t.h ../t/e.h hg locate -r 0 path:t/x ../t/x hg locate -r 0 re:.*\.h$ ../t.h ../t/e.h