Mercurial > hg
view tests/test-locate.out @ 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 |
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