##// END OF EJS Templates
templatefilters: add filter to convert date to local date (issue1674)...
templatefilters: add filter to convert date to local date (issue1674) Issue1674 suggests the localdate filter be applied as default to log, but this patch only introduces the filter, not the changed default behaviour.

File last commit:

r8270:3477ad0b merge default
r8591:08c93b07 default
Show More
test-rebase-keep-branch
32 lines | 633 B | text/plain | TextLexer
/ tests / test-rebase-keep-branch
Augie Fackler
rebase: add support to keep branch names...
r7468 #!/bin/sh
echo "[extensions]" >> $HGRCPATH
echo "graphlog=" >> $HGRCPATH
echo "rebase=" >> $HGRCPATH
addcommit () {
echo $1 > $1
hg add $1
Martin Geisler
tests: removed redundant "-u test" from test scripts...
r8168 hg commit -d "${2} 0" -m $1
Augie Fackler
rebase: add support to keep branch names...
r7468 }
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'
Patrick Mezard
rebase: fix bug where --keepbranches could leave wrong branch in dirstate...
r8266 echo '% dirstate branch should be "notdefault"'
hg branch