39 |
41 |
40 echo |
42 echo |
41 echo "% - Rebasing B onto E - check keep" |
43 echo "% - Rebasing B onto E - check keep" |
42 createrepo > /dev/null 2>&1 |
44 createrepo > /dev/null 2>&1 |
43 hg glog --template '{rev}:{desc}:{branches}\n' |
45 hg glog --template '{rev}:{desc}:{branches}\n' |
44 hg rebase -s 1 -d 4 --keep 2>&1 | sed 's/\(saving bundle to \).*/\1/' |
46 hg rebase -s 1 -d 4 --keep | hidebackup |
45 |
47 |
46 echo |
48 echo |
47 echo "% - Solve the conflict and go on" |
49 echo "% - Solve the conflict and go on" |
48 echo 'conflict solved' > A |
50 echo 'conflict solved' > A |
49 rm A.orig |
51 rm A.orig |
50 hg resolve -m A |
52 hg resolve -m A |
51 hg rebase --continue 2>&1 | sed 's/\(saving bundle to \).*/\1/' |
53 hg rebase --continue | hidebackup |
52 hg glog --template '{rev}:{desc}:{branches}\n' |
54 hg glog --template '{rev}:{desc}:{branches}\n' |
53 |
55 |
54 echo |
56 echo |
55 echo "% - Rebase F onto E - check keepbranches" |
57 echo "% - Rebase F onto E - check keepbranches" |
56 createrepo > /dev/null 2>&1 |
58 createrepo > /dev/null 2>&1 |
57 hg glog --template '{rev}:{desc}:{branches}\n' |
59 hg glog --template '{rev}:{desc}:{branches}\n' |
58 hg rebase -s 5 -d 4 --keepbranches 2>&1 | sed 's/\(saving bundle to \).*/\1/' |
60 hg rebase -s 5 -d 4 --keepbranches | hidebackup |
59 |
61 |
60 echo |
62 echo |
61 echo "% - Solve the conflict and go on" |
63 echo "% - Solve the conflict and go on" |
62 echo 'conflict solved' > A |
64 echo 'conflict solved' > A |
63 rm A.orig |
65 rm A.orig |
64 hg resolve -m A |
66 hg resolve -m A |
65 hg rebase --continue 2>&1 | sed 's/\(saving bundle to \).*/\1/' |
67 hg rebase --continue 2>&1 | hidebackup |
66 hg glog --template '{rev}:{desc}:{branches}\n' |
68 hg glog --template '{rev}:{desc}:{branches}\n' |
67 |
69 |
68 exit 0 |
70 exit 0 |