375 (use --hidden to access hidden revisions) |
375 (use --hidden to access hidden revisions) |
376 [255] |
376 [255] |
377 $ hg rebase -r ad78ff7d621f -r 53a94305e133 -d 2db36d8066ff |
377 $ hg rebase -r ad78ff7d621f -r 53a94305e133 -d 2db36d8066ff |
378 rebasing 10:ad78ff7d621f "add cK" |
378 rebasing 10:ad78ff7d621f "add cK" |
379 rebasing 11:53a94305e133 "add cL" |
379 rebasing 11:53a94305e133 "add cL" |
380 2 new unstable changesets |
|
381 $ hg log -G |
380 $ hg log -G |
382 o 13:2f7b7704d714 add cL |
381 o 13:2f7b7704d714 add cL |
383 | |
382 | |
384 o 12:fe1634cbe235 add cK |
383 o 12:fe1634cbe235 add cK |
385 | |
384 | |
386 | @ 9:55c73a90e4b4 add cJ |
385 | o 11:53a94305e133 add cL |
387 | | |
386 | | |
388 | | o 7:18214586bf78 add cJ |
387 | o 10:ad78ff7d621f add cK |
|
388 | | |
|
389 | | @ 9:55c73a90e4b4 add cJ |
|
390 | | | |
|
391 | | | o 7:18214586bf78 add cJ |
|
392 | | |/ |
|
393 | | o 6:cf5c4f4554ce add cH |
|
394 | | | |
|
395 | | o 5:5419eb264a33 add cG |
|
396 | | | |
|
397 | | o 4:98065434e5c6 add cE |
389 | |/ |
398 | |/ |
390 | o 6:cf5c4f4554ce add cH |
399 o | 3:2db36d8066ff add cD |
391 | | |
400 | | |
392 | o 5:5419eb264a33 add cG |
401 o | 2:7df62a38b9bf add cC |
393 | | |
402 | | |
394 | o 4:98065434e5c6 add cE |
403 o | 1:02bcbc3f6e56 add cB |
395 | | |
404 |/ |
396 x | 3:2db36d8066ff add cD |
405 o 0:54ccbc537fc2 add cA |
397 | | |
406 |
398 x | 2:7df62a38b9bf add cC |
407 Check that amending in the middle of a stack does not show obsolete revs |
399 | | |
408 |
400 x | 1:02bcbc3f6e56 add cB |
409 $ hg prune 1:: |
401 |/ |
410 5 changesets pruned |
402 o 0:54ccbc537fc2 add cA |
411 $ hg prune 10:: |
403 |
412 2 changesets pruned |
|
413 $ hg log -G |
|
414 @ 9:55c73a90e4b4 add cJ |
|
415 | |
|
416 | o 7:18214586bf78 add cJ |
|
417 |/ |
|
418 o 6:cf5c4f4554ce add cH |
|
419 | |
|
420 o 5:5419eb264a33 add cG |
|
421 | |
|
422 o 4:98065434e5c6 add cE |
|
423 | |
|
424 o 0:54ccbc537fc2 add cA |
|
425 |
|
426 $ hg up 7 |
|
427 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
428 $ mkcommit cL |
|
429 $ mkcommit cM |
|
430 $ mkcommit cN |
|
431 $ hg log -G |
|
432 @ 16:a438c045eb37 add cN |
|
433 | |
|
434 o 15:2d66e189f5b5 add cM |
|
435 | |
|
436 o 14:d66ccb8c5871 add cL |
|
437 | |
|
438 | o 9:55c73a90e4b4 add cJ |
|
439 | | |
|
440 o | 7:18214586bf78 add cJ |
|
441 |/ |
|
442 o 6:cf5c4f4554ce add cH |
|
443 | |
|
444 o 5:5419eb264a33 add cG |
|
445 | |
|
446 o 4:98065434e5c6 add cE |
|
447 | |
|
448 o 0:54ccbc537fc2 add cA |
|
449 |
|
450 $ hg up 15 |
|
451 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
452 $ echo "mmm" >> cM |
|
453 $ hg amend |
|
454 $ hg log -G |
|
455 @ 18:210589181b14 add cM |
|
456 | |
|
457 | o 16:a438c045eb37 add cN |
|
458 | | |
|
459 | o 15:2d66e189f5b5 add cM |
|
460 |/ |
|
461 o 14:d66ccb8c5871 add cL |
|
462 | |
|
463 | o 9:55c73a90e4b4 add cJ |
|
464 | | |
|
465 o | 7:18214586bf78 add cJ |
|
466 |/ |
|
467 o 6:cf5c4f4554ce add cH |
|
468 | |
|
469 o 5:5419eb264a33 add cG |
|
470 | |
|
471 o 4:98065434e5c6 add cE |
|
472 | |
|
473 o 0:54ccbc537fc2 add cA |
|
474 |
|
475 |