equal
deleted
inserted
replaced
217 date: Tue Sep 03 13:55:08 2013 -0400 |
217 date: Tue Sep 03 13:55:08 2013 -0400 |
218 summary: added default.txt |
218 summary: added default.txt |
219 |
219 |
220 $ hg rebase -s9 -d2 --debug # use debug to really check merge base used |
220 $ hg rebase -s9 -d2 --debug # use debug to really check merge base used |
221 rebase onto 2 starting from e31216eec445 |
221 rebase onto 2 starting from e31216eec445 |
|
222 ignoring null merge rebase of 3 |
|
223 ignoring null merge rebase of 4 |
|
224 ignoring null merge rebase of 6 |
|
225 ignoring null merge rebase of 8 |
222 rebasing 9:e31216eec445 "more changes to f1" |
226 rebasing 9:e31216eec445 "more changes to f1" |
223 rebasing: 9:e31216eec445 5/6 changesets (83.33%) |
227 rebasing: 9:e31216eec445 5/6 changesets (83.33%) |
224 future parents are 2 and -1 |
228 future parents are 2 and -1 |
225 rebase status stored |
229 rebase status stored |
226 update to 2:4bc80088dc6b |
230 update to 2:4bc80088dc6b |
241 ancestor: 8e4e2c1a07ae, local: 4bc80088dc6b+, remote: e31216eec445 |
245 ancestor: 8e4e2c1a07ae, local: 4bc80088dc6b+, remote: e31216eec445 |
242 f1.txt: remote is newer -> g |
246 f1.txt: remote is newer -> g |
243 getting f1.txt |
247 getting f1.txt |
244 updating: f1.txt 1/1 files (100.00%) |
248 updating: f1.txt 1/1 files (100.00%) |
245 f1.txt |
249 f1.txt |
|
250 rebased as 19c888675e13 |
246 rebasing 10:2f2496ddf49d "merge" (tip) |
251 rebasing 10:2f2496ddf49d "merge" (tip) |
247 rebasing: 10:2f2496ddf49d 6/6 changesets (100.00%) |
252 rebasing: 10:2f2496ddf49d 6/6 changesets (100.00%) |
248 future parents are 11 and 7 |
253 future parents are 11 and 7 |
249 rebase status stored |
254 rebase status stored |
250 already in target |
255 already in target |
256 ancestor: e31216eec445, local: 19c888675e13+, remote: 2f2496ddf49d |
261 ancestor: e31216eec445, local: 19c888675e13+, remote: 2f2496ddf49d |
257 f1.txt: remote is newer -> g |
262 f1.txt: remote is newer -> g |
258 getting f1.txt |
263 getting f1.txt |
259 updating: f1.txt 1/1 files (100.00%) |
264 updating: f1.txt 1/1 files (100.00%) |
260 f1.txt |
265 f1.txt |
|
266 rebased as 2a7f09cac94c |
261 rebase merging completed |
267 rebase merging completed |
262 update back to initial working directory parent |
268 update back to initial working directory parent |
263 resolving manifests |
269 resolving manifests |
264 branchmerge: False, force: False, partial: False |
270 branchmerge: False, force: False, partial: False |
265 ancestor: 2a7f09cac94c, local: 2a7f09cac94c+, remote: d79e2059b5c0 |
271 ancestor: 2a7f09cac94c, local: 2a7f09cac94c+, remote: d79e2059b5c0 |