equal
deleted
inserted
replaced
52 searching for changes |
52 searching for changes |
53 adding changesets |
53 adding changesets |
54 adding manifests |
54 adding manifests |
55 adding file changes |
55 adding file changes |
56 added 1 changesets with 1 changes to 1 files (+1 heads) |
56 added 1 changesets with 1 changes to 1 files (+1 heads) |
|
57 new changesets 77ae9631bcca |
57 rebasing 2:ff8d69a621f9 "L1" |
58 rebasing 2:ff8d69a621f9 "L1" |
58 saved backup bundle to $TESTTMP/b/.hg/strip-backup/ff8d69a621f9-160fa373-rebase.hg (glob) |
59 saved backup bundle to $TESTTMP/b/.hg/strip-backup/ff8d69a621f9-160fa373-rebase.hg (glob) |
59 |
60 |
60 $ hg tglog |
61 $ hg tglog |
61 @ 3: 'L1' |
62 @ 3: 'L1' |
141 searching for changes |
142 searching for changes |
142 adding changesets |
143 adding changesets |
143 adding manifests |
144 adding manifests |
144 adding file changes |
145 adding file changes |
145 added 1 changesets with 1 changes to 1 files |
146 added 1 changesets with 1 changes to 1 files |
|
147 new changesets 77ae9631bcca |
146 nothing to rebase - updating instead |
148 nothing to rebase - updating instead |
147 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
149 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
148 updating bookmark norebase |
150 updating bookmark norebase |
149 |
151 |
150 $ hg tglog -l 1 |
152 $ hg tglog -l 1 |
208 searching for changes |
210 searching for changes |
209 adding changesets |
211 adding changesets |
210 adding manifests |
212 adding manifests |
211 adding file changes |
213 adding file changes |
212 added 2 changesets with 2 changes to 2 files |
214 added 2 changesets with 2 changes to 2 files |
|
215 new changesets 31cd3a05214e:770a61882ace |
213 rebasing 3:ff8d69a621f9 "L1" |
216 rebasing 3:ff8d69a621f9 "L1" |
214 saved backup bundle to $TESTTMP/c/.hg/strip-backup/ff8d69a621f9-160fa373-rebase.hg (glob) |
217 saved backup bundle to $TESTTMP/c/.hg/strip-backup/ff8d69a621f9-160fa373-rebase.hg (glob) |
215 $ hg tglog |
218 $ hg tglog |
216 @ 5: 'L1' |
219 @ 5: 'L1' |
217 | |
220 | |
250 searching for changes |
253 searching for changes |
251 adding changesets |
254 adding changesets |
252 adding manifests |
255 adding manifests |
253 adding file changes |
256 adding file changes |
254 added 1 changesets with 1 changes to 1 files (+1 heads) |
257 added 1 changesets with 1 changes to 1 files (+1 heads) |
|
258 new changesets 00e3b7781125 |
255 rebasing 5:518d153c0ba3 "L1" |
259 rebasing 5:518d153c0ba3 "L1" |
256 saved backup bundle to $TESTTMP/c/.hg/strip-backup/518d153c0ba3-73407f14-rebase.hg (glob) |
260 saved backup bundle to $TESTTMP/c/.hg/strip-backup/518d153c0ba3-73407f14-rebase.hg (glob) |
257 $ hg tglog |
261 $ hg tglog |
258 @ 6: 'L1' |
262 @ 6: 'L1' |
259 | |
263 | |
302 searching for changes |
306 searching for changes |
303 adding changesets |
307 adding changesets |
304 adding manifests |
308 adding manifests |
305 adding file changes |
309 adding file changes |
306 added 1 changesets with 1 changes to 1 files (+1 heads) |
310 added 1 changesets with 1 changes to 1 files (+1 heads) |
|
311 new changesets 88dd24261747 |
307 rebasing 6:0d0727eb7ce0 "L1" |
312 rebasing 6:0d0727eb7ce0 "L1" |
308 rebasing 7:c1f58876e3bf "L2" |
313 rebasing 7:c1f58876e3bf "L2" |
309 saved backup bundle to $TESTTMP/c/.hg/strip-backup/0d0727eb7ce0-ef61ccb2-rebase.hg (glob) |
314 saved backup bundle to $TESTTMP/c/.hg/strip-backup/0d0727eb7ce0-ef61ccb2-rebase.hg (glob) |
310 $ hg tglog |
315 $ hg tglog |
311 o 8: 'L2' |
316 o 8: 'L2' |
343 searching for changes |
348 searching for changes |
344 adding changesets |
349 adding changesets |
345 adding manifests |
350 adding manifests |
346 adding file changes |
351 adding file changes |
347 added 1 changesets with 1 changes to 1 files (+1 heads) |
352 added 1 changesets with 1 changes to 1 files (+1 heads) |
|
353 new changesets 65bc164c1d9b |
348 nothing to rebase - updating instead |
354 nothing to rebase - updating instead |
349 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
355 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
350 updated to "65bc164c1d9b: R6" |
356 updated to "65bc164c1d9b: R6" |
351 1 other heads for branch "default" |
357 1 other heads for branch "default" |
352 $ hg tglog |
358 $ hg tglog |
392 searching for changes |
398 searching for changes |
393 adding changesets |
399 adding changesets |
394 adding manifests |
400 adding manifests |
395 adding file changes |
401 adding file changes |
396 added 1 changesets with 1 changes to 1 files |
402 added 1 changesets with 1 changes to 1 files |
|
403 new changesets 39c381359968 |
397 nothing to rebase |
404 nothing to rebase |
398 |
405 |
399 There is two local heads and we pull a third one. |
406 There is two local heads and we pull a third one. |
400 The second local head should not confuse the `hg pull rebase`. |
407 The second local head should not confuse the `hg pull rebase`. |
401 |
408 |
418 searching for changes |
425 searching for changes |
419 adding changesets |
426 adding changesets |
420 adding manifests |
427 adding manifests |
421 adding file changes |
428 adding file changes |
422 added 1 changesets with 1 changes to 1 files (+1 heads) |
429 added 1 changesets with 1 changes to 1 files (+1 heads) |
|
430 new changesets f7d3e42052f9 |
423 rebasing 7:864e0a2d2614 "L1" |
431 rebasing 7:864e0a2d2614 "L1" |
424 rebasing 8:6dc0ea5dcf55 "L2" |
432 rebasing 8:6dc0ea5dcf55 "L2" |
425 saved backup bundle to $TESTTMP/c/.hg/strip-backup/864e0a2d2614-2f72c89c-rebase.hg (glob) |
433 saved backup bundle to $TESTTMP/c/.hg/strip-backup/864e0a2d2614-2f72c89c-rebase.hg (glob) |
426 $ hg tglog |
434 $ hg tglog |
427 @ 12: 'L2' |
435 @ 12: 'L2' |