view tests/test-rebase-keep-branch @ 8174:29bc5d18714a

hg: allow hg.parseurl(url, None) In many places hg.parseurl is called with a url and "opts.get('rev')", suggesting the second, optional argument can be None. Because opts['rev'] usually defaults to [] this never happens in practice. However, extensions don't necessarily behave the same, but do copy this pattern. Also, include wider hg.parseurl tests, beyond a demonstration of the problem.
author Martijn Pieters <mj@zopatista.com>
date Fri, 24 Apr 2009 18:17:42 +0200
parents 8766fee6f225
children 3477ad0b1f2c
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'