tests/test-rebase-keep-branch
author Frank Kingswood <frank@kingswood-consulting.co.uk>
Tue, 03 Mar 2009 21:32:23 +0000
changeset 7823 11efa41037e2
parent 7468 3e5db4228f8f
child 8168 8766fee6f225
child 8266 609ce91670d0
permissions -rwxr-xr-x
convert: Perforce source for conversion to Mercurial
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
7468
3e5db4228f8f rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
     1
#!/bin/sh
3e5db4228f8f rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
     2
3e5db4228f8f rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
     3
echo "[extensions]" >> $HGRCPATH
3e5db4228f8f rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
     4
echo "graphlog=" >> $HGRCPATH
3e5db4228f8f rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
     5
echo "rebase=" >> $HGRCPATH
3e5db4228f8f rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
     6
3e5db4228f8f rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
     7
addcommit () {
3e5db4228f8f rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
     8
    echo $1 > $1
3e5db4228f8f rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
     9
    hg add $1
3e5db4228f8f rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
    10
    hg commit -d "${2} 0" -u test -m $1
3e5db4228f8f rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
    11
}
3e5db4228f8f rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
    12
3e5db4228f8f rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
    13
hg init a
3e5db4228f8f rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
    14
cd a
3e5db4228f8f rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
    15
addcommit "c1" 0
3e5db4228f8f rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
    16
addcommit "c2" 1
3e5db4228f8f rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
    17
3e5db4228f8f rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
    18
addcommit "l1" 2
3e5db4228f8f rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
    19
addcommit "l2" 3
3e5db4228f8f rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
    20
3e5db4228f8f rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
    21
hg update -C 1
3e5db4228f8f rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
    22
hg branch 'notdefault'
3e5db4228f8f rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
    23
addcommit "r1" 4
3e5db4228f8f rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
    24
hg glog --template '{rev}:{desc}:{branches}\n'
3e5db4228f8f rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
    25
3e5db4228f8f rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
    26
echo
3e5db4228f8f rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
    27
echo '% Rebase a branch while preserving the branch name'
3e5db4228f8f rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
    28
hg update -C 3
3e5db4228f8f rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
    29
hg rebase -b 4 -d 3 --keepbranches 2>&1 | sed 's/\(saving bundle to \).*/\1/'
3e5db4228f8f rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
    30
hg glog --template '{rev}:{desc}:{branches}\n'