equal
deleted
inserted
replaced
83 | o 1: 'branch1' branch1 |
83 | o 1: 'branch1' branch1 |
84 |/ |
84 |/ |
85 o 0: 'A' |
85 o 0: 'A' |
86 |
86 |
87 $ hg branches |
87 $ hg branches |
88 branch3 8:05b64c4ca2d8 |
88 branch3 8:4666b71e8e32 |
89 branch2 6:b410fbec727a |
89 branch2 6:5097051d331d |
90 branch1 2:9d931918fcf7 (inactive) |
90 branch1 2:0a03079c47fd (inactive) |
91 default 0:1994f17a630e (inactive) |
91 default 0:1994f17a630e (inactive) |
92 |
92 |
93 $ hg theads |
93 $ hg theads |
94 8: 'F' branch3 |
94 8: 'F' branch3 |
95 6: 'E' branch2 |
95 6: 'E' branch2 |
99 |
99 |
100 $ hg rebase --detach -s 5 -d 8 |
100 $ hg rebase --detach -s 5 -d 8 |
101 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
101 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
102 |
102 |
103 $ hg branches |
103 $ hg branches |
104 branch3 8:c1d4b9719987 |
104 branch3 8:466cdfb14b62 |
105 branch2 4:1be2b203ae5e |
105 branch2 4:e4fdb121d036 |
106 branch1 2:9d931918fcf7 |
106 branch1 2:0a03079c47fd |
107 default 0:1994f17a630e (inactive) |
107 default 0:1994f17a630e (inactive) |
108 |
108 |
109 $ hg theads |
109 $ hg theads |
110 8: 'E' branch3 |
110 8: 'E' branch3 |
111 4: 'C' branch2 |
111 4: 'C' branch2 |
160 |
160 |
161 $ hg rebase --detach -s 8 -d 6 |
161 $ hg rebase --detach -s 8 -d 6 |
162 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob) |
162 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob) |
163 |
163 |
164 $ hg branches |
164 $ hg branches |
165 branch2 8:e1e80ed73210 |
165 branch2 8:6b4bdc1b5ac0 |
166 branch3 7:75fd7b643dce |
166 branch3 7:653b9feb4616 |
167 branch1 2:9d931918fcf7 (inactive) |
167 branch1 2:0a03079c47fd (inactive) |
168 default 0:1994f17a630e (inactive) |
168 default 0:1994f17a630e (inactive) |
169 |
169 |
170 $ hg theads |
170 $ hg theads |
171 8: 'F' branch2 |
171 8: 'F' branch2 |
172 7: 'branch3' branch3 |
172 7: 'branch3' branch3 |
224 |
224 |
225 $ hg rebase --detach -s 7 -d 6 |
225 $ hg rebase --detach -s 7 -d 6 |
226 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob) |
226 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob) |
227 |
227 |
228 $ hg branches |
228 $ hg branches |
229 branch2 7:e1e80ed73210 |
229 branch2 7:6b4bdc1b5ac0 |
230 branch1 2:9d931918fcf7 (inactive) |
230 branch1 2:0a03079c47fd (inactive) |
231 default 0:1994f17a630e (inactive) |
231 default 0:1994f17a630e (inactive) |
232 |
232 |
233 $ hg theads |
233 $ hg theads |
234 7: 'F' branch2 |
234 7: 'F' branch2 |
235 4: 'C' branch2 |
235 4: 'C' branch2 |