Mercurial > hg
view tests/test-issue1306 @ 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 | cb93eee1fbcd |
children |
line wrap: on
line source
#!/bin/sh echo % initialize remote repo with branches hg init remote cd remote echo a > a hg ci -Ama hg branch br hg ci -Amb echo c > c hg ci -Amc hg log cd .. echo % try cloning -r branch hg clone -rbr remote local1 hg -R local1 parents echo % try cloning -rother clone#branch hg clone -r0 remote#br local2 hg -R local2 parents echo % try cloning -r1 clone#branch hg clone -r1 remote#br local3 hg -R local3 parents