Mercurial > hg
view tests/test-convert-splicemap.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 | a3d73b3e1f8a |
| children |
line wrap: on
line source
adding a adding b adding c adding a adding d adding e % test invalid splicemap abort: syntax error in splicemap(1): key/value pair expected % splice repo2 on repo1 updating to branch default 3 files updated, 0 files merged, 0 files removed, 0 files unresolved scanning source... sorting... converting... 2 addaandd spliced in ['6d4c2037ddc2cb2627ac3a244ecce35283268f8e'] as parents of 527cdedf31fbd5ea708aa14eeecf53d4676f38db 1 changed spliced in ['e55c719b85b60e5102fac26110ba626e7cb6b7dc', '527cdedf31fbd5ea708aa14eeecf53d4676f38db'] as parents of e4ea00df91897da3079a10fab658c1eddba6617b 0 adde o 5 "adde" files: e | o 4 "changed" files: d |\ | o 3 "addaandd" files: a d | | @ | 2 "addc" files: c |/ o 1 "addb" files: a b | o 0 "adda" files: a