Mercurial > public > mercurial-scm > hg

diff tests/test-rebase-keep-branch @ 7468:3e5db4228f8f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: add support to keep branch names Callback on extra fields added by Patrick Mezard <pmezard@gmail.com>.
author Augie Fackler <durin42@gmail.com>
date Tue, 18 Nov 2008 21:46:01 -0600
parents
children 8766fee6f225 609ce91670d0
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-rebase-keep-branch	Tue Nov 18 21:46:01 2008 -0600
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+echo "[extensions]" >> $HGRCPATH
+echo "graphlog=" >> $HGRCPATH
+echo "rebase=" >> $HGRCPATH
+
+addcommit () {
+    echo $1 > $1
+    hg add $1
+    hg commit -d "${2} 0" -u test -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'