Mercurial > hg
view tests/test-rebase-issue-noparam-single-rev @ 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 | 8766fee6f225 |
children | b345b1cc124f |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "graphlog=" >> $HGRCPATH echo "rebase=" >> $HGRCPATH addcommit () { echo $1 > $1 hg add $1 hg commit -d "${2} 0" -m $1 } hg init a cd a addcommit "c1" 0 addcommit "c2" 1 addcommit "l1" 2 hg update -C 1 addcommit "r1" 3 addcommit "r2" 4 hg glog --template '{rev}:{desc}\n' echo echo '% Rebase with no arguments - single revision in source branch' hg update -C 2 hg rebase 2>&1 | sed 's/\(saving bundle to \).*/\1/' hg glog --template '{rev}:{desc}\n' cd .. rm -rf a hg init a cd a addcommit "c1" 0 addcommit "c2" 1 addcommit "l1" 2 addcommit "l2" 3 hg update -C 1 addcommit "r1" 4 hg glog --template '{rev}:{desc}\n' echo echo '% Rebase with no arguments - single revision in target branch' hg update -C 3 hg rebase 2>&1 | sed 's/\(saving bundle to \).*/\1/' hg glog --template '{rev}:{desc}\n'