140 adding r6 |
140 adding r6 |
141 |
141 |
142 $ hg up -q qtip |
142 $ hg up -q qtip |
143 |
143 |
144 $ HGMERGE=internal:fail hg rebase |
144 $ HGMERGE=internal:fail hg rebase |
145 rebasing 1:b4bffa6e4776 "r1" (1.diff qbase) |
145 rebasing 1:b4bffa6e4776 "r1" (qbase r1) |
146 note: rebase of 1:b4bffa6e4776 created no changes to commit |
146 note: rebase of 1:b4bffa6e4776 created no changes to commit |
147 rebasing 2:c0fd129beb01 "r2" (2.diff) |
147 rebasing 2:c0fd129beb01 "r2" (r2) |
148 rebasing 3:6ff5b8feed8e "r3" (3.diff) |
148 rebasing 3:6ff5b8feed8e "r3" (r3) |
149 note: rebase of 3:6ff5b8feed8e created no changes to commit |
149 note: rebase of 3:6ff5b8feed8e created no changes to commit |
150 rebasing 4:094320fec554 "r4" (4.diff) |
150 rebasing 4:094320fec554 "r4" (r4) |
151 unresolved conflicts (see hg resolve, then hg rebase --continue) |
151 unresolved conflicts (see hg resolve, then hg rebase --continue) |
152 [1] |
152 [1] |
153 |
153 |
154 $ HGMERGE=internal:local hg resolve --all |
154 $ HGMERGE=internal:local hg resolve --all |
155 (no more unresolved files) |
155 (no more unresolved files) |
156 |
156 |
157 $ hg rebase --continue |
157 $ hg rebase --continue |
158 already rebased 1:b4bffa6e4776 "r1" (1.diff qbase) as 057f55ff8f44 |
158 already rebased 1:b4bffa6e4776 "r1" (qbase r1) as 057f55ff8f44 |
159 already rebased 2:c0fd129beb01 "r2" (2.diff) as 1660ab13ce9a |
159 already rebased 2:c0fd129beb01 "r2" (r2) as 1660ab13ce9a |
160 already rebased 3:6ff5b8feed8e "r3" (3.diff) as 1660ab13ce9a |
160 already rebased 3:6ff5b8feed8e "r3" (r3) as 1660ab13ce9a |
161 rebasing 4:094320fec554 "r4" (4.diff) |
161 rebasing 4:094320fec554 "r4" (r4) |
162 note: rebase of 4:094320fec554 created no changes to commit |
162 note: rebase of 4:094320fec554 created no changes to commit |
163 rebasing 5:681a378595ba "r5" (5.diff) |
163 rebasing 5:681a378595ba "r5" (r5) |
164 rebasing 6:512a1f24768b "r6" (6.diff qtip) |
164 rebasing 6:512a1f24768b "r6" (qtip r6) |
165 note: rebase of 6:512a1f24768b created no changes to commit |
165 note: rebase of 6:512a1f24768b created no changes to commit |
166 saved backup bundle to $TESTTMP/b/.hg/strip-backup/b4bffa6e4776-b9bfb84d-backup.hg (glob) |
166 saved backup bundle to $TESTTMP/b/.hg/strip-backup/b4bffa6e4776-b9bfb84d-backup.hg (glob) |
167 |
167 |
168 $ hg tglog |
168 $ hg tglog |
169 @ 8: 'r5' tags: 5.diff qtip tip |
169 @ 8: 'r5' tags: qtip r5 tip |
170 | |
170 | |
171 o 7: 'r2' tags: 2.diff qbase |
171 o 7: 'r2' tags: qbase r2 |
172 | |
172 | |
173 o 6: 'branch2-r6' tags: qparent |
173 o 6: 'branch2-r6' tags: qparent |
174 | |
174 | |
175 o 5: 'branch2-r4' tags: |
175 o 5: 'branch2-r4' tags: |
176 | |
176 | |