equal
deleted
inserted
replaced
452 diff --git a/another-dir/initial-file b/another-dir/renamed-file |
452 diff --git a/another-dir/initial-file b/another-dir/renamed-file |
453 rename from another-dir/initial-file |
453 rename from another-dir/initial-file |
454 rename to another-dir/renamed-file |
454 rename to another-dir/renamed-file |
455 |
455 |
456 $ cd .. |
456 $ cd .. |
|
457 |
|
458 Test that branches are preserved and stays active |
|
459 ------------------------------------------------- |
|
460 |
|
461 $ hg init repo-with-branch |
|
462 $ cd repo-with-branch |
|
463 $ echo a > a |
|
464 $ hg add a |
|
465 $ hg commit -m A |
|
466 $ hg branch foo |
|
467 marked working directory as branch foo |
|
468 (branches are permanent and global, did you want a bookmark?) |
|
469 $ echo a > b |
|
470 $ hg add b |
|
471 $ hg commit -m foo-B |
|
472 $ echo a > c |
|
473 $ hg add c |
|
474 $ hg commit -m foo-C |
|
475 |
|
476 $ hg branch |
|
477 foo |
|
478 $ echo "pick efefa76d6dc3 2 foo-C" >> cmd |
|
479 $ echo "pick 7336e7550422 1 foo-B" >> cmd |
|
480 |
|
481 $ HGEDITOR=cat hg histedit -r ".^" --commands cmd --quiet |
|
482 $ hg log --template '{rev} {branch}\n' |
|
483 2 foo |
|
484 1 foo |
|
485 0 default |
|
486 $ hg branch |
|
487 foo |
|
488 |
|
489 $ cd .. |