equal
deleted
inserted
replaced
676 remote: added 1 changesets with 1 changes to 1 files (+1 heads) |
676 remote: added 1 changesets with 1 changes to 1 files (+1 heads) |
677 exporting bookmark W |
677 exporting bookmark W |
678 $ hg -R ../b id -r W |
678 $ hg -R ../b id -r W |
679 cc978a373a53 tip W |
679 cc978a373a53 tip W |
680 |
680 |
|
681 pushing an existing but divergent bookmark with -B still requires -f |
|
682 |
|
683 $ hg clone -q . r |
|
684 $ hg up -q X |
|
685 $ echo 1 > f2 |
|
686 $ hg ci -qAml |
|
687 |
|
688 $ cd r |
|
689 $ hg up -q X |
|
690 $ echo 2 > f2 |
|
691 $ hg ci -qAmr |
|
692 $ hg push -B X |
|
693 pushing to $TESTTMP/addmarks (glob) |
|
694 searching for changes |
|
695 remote has heads on branch 'default' that are not known locally: a2a606d9ff1b |
|
696 abort: push creates new remote head 54694f811df9 with bookmark 'X'! |
|
697 (pull and merge or see "hg help push" for details about pushing new heads) |
|
698 [255] |
|
699 $ cd .. |
|
700 |
681 Check summary output for incoming/outgoing bookmarks |
701 Check summary output for incoming/outgoing bookmarks |
682 |
702 |
683 $ hg bookmarks -d X |
703 $ hg bookmarks -d X |
684 $ hg bookmarks -d Y |
704 $ hg bookmarks -d Y |
685 $ hg summary --remote | grep '^remote:' |
705 $ hg summary --remote | grep '^remote:' |