equal
deleted
inserted
replaced
24 hg glog --template '{rev}:{desc}:{branches}\n' |
24 hg glog --template '{rev}:{desc}:{branches}\n' |
25 |
25 |
26 echo |
26 echo |
27 echo '% Rebase a branch while preserving the branch name' |
27 echo '% Rebase a branch while preserving the branch name' |
28 hg update -C 3 |
28 hg update -C 3 |
29 hg rebase -b 4 -d 3 --keepbranches 2>&1 | sed 's/\(saving bundle to \).*/\1/' |
29 hg rebase -b 4 -d 3 --keepbranches -q |
30 hg glog --template '{rev}:{desc}:{branches}\n' |
30 hg glog --template '{rev}:{desc}:{branches}\n' |
31 echo '% dirstate branch should be "notdefault"' |
31 echo '% dirstate branch should be "notdefault"' |
32 hg branch |
32 hg branch |