Mercurial > hg
view tests/test-locate @ 9717:68a1b9d0663e
update: allow branch crossing without -c or -C, with no uncommitted changes
Update will now allow crossing branches within the same named branch,
when given a specific revision, if the working dir is clean, without
requiring the -c or -C option. Abort if no revision is given and
this would cross branches. Minor change to abort message if
uncommitted changes are found.
Modify test-update-branches and output to reflect the altered case. Modify
test-merge5.out to reflect the altered case. Modify
test-up-local-change.out with new message.
author | Stuart W Marks <smarks@smarks.org> |
---|---|
date | Thu, 05 Nov 2009 10:53:59 +0100 |
parents | a5cde03cd019 |
children | 4c94b6d0fb1c |
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$'