Mercurial > hg
view tests/test-rebase-keep-branch @ 10734:7a0502a6f9a1
patchbomb: --desc implies --intro
For a single patch, an introductory text should not remain unsent
if --intro has been omitted, as the intent of --desc is clear.
author | Cédric Duval <cedricduval@free.fr> |
---|---|
date | Mon, 15 Mar 2010 22:37:38 +0100 |
parents | 3477ad0b1f2c |
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 addcommit "l2" 3 hg update -C 1 hg branch 'notdefault' addcommit "r1" 4 hg glog --template '{rev}:{desc}:{branches}\n' echo echo '% Rebase a branch while preserving the branch name' hg update -C 3 hg rebase -b 4 -d 3 --keepbranches 2>&1 | sed 's/\(saving bundle to \).*/\1/' hg glog --template '{rev}:{desc}:{branches}\n' echo '% dirstate branch should be "notdefault"' hg branch