Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-locate @ 5045:f191bc3916f7
merge: do early copy to deal with issue636
Without copies/renames, merges source names are 1:1 with their
targets. Copies and renames introduce the possibility that there will
be two merges with the same input but different output. By doing the
copy to the destination name before the merge, the actual merge
becomes 1:1 again, and no source is the input to two different merges.
- add a preliminary scan to applyupdates to do copies
- for the merge action, pass the old name (for finding ancestors) and
the new name (for input to the merge) to filemerge
- eliminate the old post-merge copy
- lookup file contents from new name in filemerge
- pass new name to external merge helper
- report merge failure at new name
- add a test
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 01 Aug 2007 12:33:12 -0500 |
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$'