Mercurial > hg
view tests/test-status.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 | acc40572da5b |
children | 54cd28258ea7 |
line wrap: on
line source
hg status in repo root: ? a/1/in_a_1 ? a/in_a ? b/1/in_b_1 ? b/2/in_b_2 ? b/in_b ? in_root hg status . in repo root: ? a/1/in_a_1 ? a/in_a ? b/1/in_b_1 ? b/2/in_b_2 ? b/in_b ? in_root hg status in a: ? a/1/in_a_1 ? a/in_a ? b/1/in_b_1 ? b/2/in_b_2 ? b/in_b ? in_root hg status . in a: ? 1/in_a_1 ? in_a hg status .. in a: ? 1/in_a_1 ? in_a ? ../b/1/in_b_1 ? ../b/2/in_b_2 ? ../b/in_b ? ../in_root hg status in b: ? a/1/in_a_1 ? a/in_a ? b/1/in_b_1 ? b/2/in_b_2 ? b/in_b ? in_root hg status . in b: ? 1/in_b_1 ? 2/in_b_2 ? in_b hg status .. in b: ? ../a/1/in_a_1 ? ../a/in_a ? 1/in_b_1 ? 2/in_b_2 ? in_b ? ../in_root hg status in a/1: ? a/1/in_a_1 ? a/in_a ? b/1/in_b_1 ? b/2/in_b_2 ? b/in_b ? in_root hg status . in a/1: ? in_a_1 hg status .. in a/1: ? in_a_1 ? ../in_a hg status in b/1: ? a/1/in_a_1 ? a/in_a ? b/1/in_b_1 ? b/2/in_b_2 ? b/in_b ? in_root hg status . in b/1: ? in_b_1 hg status .. in b/1: ? in_b_1 ? ../2/in_b_2 ? ../in_b hg status in b/2: ? a/1/in_a_1 ? a/in_a ? b/1/in_b_1 ? b/2/in_b_2 ? b/in_b ? in_root hg status . in b/2: ? in_b_2 hg status .. in b/2: ? ../1/in_b_1 ? in_b_2 ? ../in_b adding .hgignore adding deleted adding modified adding removed hg status: A added R removed ! deleted ? unknown hg status modified added removed deleted unknown never-existed ignored: never-existed: No such file or directory A added R removed ! deleted ? unknown hg status -C: A added A copied modified R removed ! deleted ? unknown hg status -A: A added A copied modified R removed ! deleted ? unknown I ignored C .hgignore C modified hg status ignoreddir/file: hg status -i ignoreddir/file: I ignoreddir/file adding .hgignore adding deleted adding modified adding removed