40 createrepo > /dev/null 2>&1 |
42 createrepo > /dev/null 2>&1 |
41 hg glog --template '{rev}: {desc}\n' |
43 hg glog --template '{rev}: {desc}\n' |
42 |
44 |
43 echo '% Rebasing' |
45 echo '% Rebasing' |
44 echo '% B onto F - simple rebase' |
46 echo '% B onto F - simple rebase' |
45 hg rebase -s 1 -d 5 2>&1 | sed 's/\(saving bundle to \).*/\1/' |
47 hg rebase -s 1 -d 5 | hidebackup |
46 hg glog --template '{rev}: {desc}\n' |
48 hg glog --template '{rev}: {desc}\n' |
47 |
49 |
48 createrepo > /dev/null 2>&1 |
50 createrepo > /dev/null 2>&1 |
49 echo '% B onto D - intermediate point' |
51 echo '% B onto D - intermediate point' |
50 hg rebase -s 1 -d 3 2>&1 | sed 's/\(saving bundle to \).*/\1/' |
52 hg rebase -s 1 -d 3 | hidebackup |
51 hg glog --template '{rev}: {desc}\n' |
53 hg glog --template '{rev}: {desc}\n' |
52 |
54 |
53 createrepo > /dev/null 2>&1 |
55 createrepo > /dev/null 2>&1 |
54 echo '% C onto F - skip of E' |
56 echo '% C onto F - skip of E' |
55 hg rebase -s 2 -d 5 2>&1 | sed 's/\(saving bundle to \).*/\1/' |
57 hg rebase -s 2 -d 5 | hidebackup |
56 hg glog --template '{rev}: {desc}\n' |
58 hg glog --template '{rev}: {desc}\n' |
57 |
59 |
58 createrepo > /dev/null 2>&1 |
60 createrepo > /dev/null 2>&1 |
59 echo '% D onto C - rebase of a branching point (skip E)' |
61 echo '% D onto C - rebase of a branching point (skip E)' |
60 hg rebase -s 3 -d 2 2>&1 | sed 's/\(saving bundle to \).*/\1/' |
62 hg rebase -s 3 -d 2 | hidebackup |
61 hg glog --template '{rev}: {desc}\n' |
63 hg glog --template '{rev}: {desc}\n' |
62 |
64 |
63 createrepo > /dev/null 2>&1 |
65 createrepo > /dev/null 2>&1 |
64 echo '% E onto F - merged revision having a parent in ancestors of target' |
66 echo '% E onto F - merged revision having a parent in ancestors of target' |
65 hg rebase -s 4 -d 5 2>&1 | sed 's/\(saving bundle to \).*/\1/' |
67 hg rebase -s 4 -d 5 | hidebackup |
66 hg glog --template '{rev}: {desc}\n' |
68 hg glog --template '{rev}: {desc}\n' |
67 |
69 |
68 createrepo > /dev/null 2>&1 |
70 createrepo > /dev/null 2>&1 |
69 echo '% D onto B - E maintains C as parent' |
71 echo '% D onto B - E maintains C as parent' |
70 hg rebase -s 3 -d 1 2>&1 | sed 's/\(saving bundle to \).*/\1/' |
72 hg rebase -s 3 -d 1 | hidebackup |
71 hg glog --template '{rev}: {desc}\n' |
73 hg glog --template '{rev}: {desc}\n' |
72 |
74 |
73 echo '% These will fail (using --source)' |
75 echo '% These will fail (using --source)' |
74 createrepo > /dev/null 2>&1 |
76 createrepo > /dev/null 2>&1 |
75 echo '% E onto D - rebase onto an ancestor' |
77 echo '% E onto D - rebase onto an ancestor' |