Mercurial > hg
view tests/test-586 @ 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 | f1af59451c0c |
children |
line wrap: on
line source
#!/bin/sh # a test for issue586 hg init a cd a echo a > a hg ci -Ama hg init ../b cd ../b echo b > b hg ci -Amb hg pull -f ../a hg merge hg rm -f a hg ci -Amc hg st -A cd .. # a test for issue 1433, related to issue586 echo % create test repos hg init repoa touch repoa/a hg -R repoa ci -Am adda hg init repob touch repob/b hg -R repob ci -Am addb hg init repoc cd repoc hg pull ../repoa hg update mkdir tst hg mv * tst hg ci -m "import a in tst" hg pull -f ../repob echo % merge both repos hg merge mkdir src echo % move b content hg mv b src hg ci -m "import b in src" hg manifest