equal
deleted
inserted
replaced
740 $ hg push http://localhost:$HGPORT2/ |
740 $ hg push http://localhost:$HGPORT2/ |
741 pushing to http://localhost:$HGPORT2/ |
741 pushing to http://localhost:$HGPORT2/ |
742 searching for changes |
742 searching for changes |
743 abort: push creates new remote head c922c0139ca0 with bookmark 'Y' |
743 abort: push creates new remote head c922c0139ca0 with bookmark 'Y' |
744 (merge or see 'hg help push' for details about pushing new heads) |
744 (merge or see 'hg help push' for details about pushing new heads) |
745 [255] |
745 [20] |
746 $ hg -R ../a book |
746 $ hg -R ../a book |
747 @ 1:0d2164f0ce0d |
747 @ 1:0d2164f0ce0d |
748 * X 1:0d2164f0ce0d |
748 * X 1:0d2164f0ce0d |
749 Y 3:f6fc62dde3c0 |
749 Y 3:f6fc62dde3c0 |
750 Z 1:0d2164f0ce0d |
750 Z 1:0d2164f0ce0d |
757 $ hg push http://localhost:$HGPORT2/ |
757 $ hg push http://localhost:$HGPORT2/ |
758 pushing to http://localhost:$HGPORT2/ |
758 pushing to http://localhost:$HGPORT2/ |
759 searching for changes |
759 searching for changes |
760 abort: push creates new remote head c922c0139ca0 with bookmark 'Y' |
760 abort: push creates new remote head c922c0139ca0 with bookmark 'Y' |
761 (merge or see 'hg help push' for details about pushing new heads) |
761 (merge or see 'hg help push' for details about pushing new heads) |
762 [255] |
762 [20] |
763 $ hg -R ../a book |
763 $ hg -R ../a book |
764 @ 1:0d2164f0ce0d |
764 @ 1:0d2164f0ce0d |
765 * X 1:0d2164f0ce0d |
765 * X 1:0d2164f0ce0d |
766 Y 3:f6fc62dde3c0 |
766 Y 3:f6fc62dde3c0 |
767 Z 1:0d2164f0ce0d |
767 Z 1:0d2164f0ce0d |
1053 pushing to $TESTTMP/addmarks |
1053 pushing to $TESTTMP/addmarks |
1054 searching for changes |
1054 searching for changes |
1055 remote has heads on branch 'default' that are not known locally: a2a606d9ff1b |
1055 remote has heads on branch 'default' that are not known locally: a2a606d9ff1b |
1056 abort: push creates new remote head 54694f811df9 with bookmark 'X' |
1056 abort: push creates new remote head 54694f811df9 with bookmark 'X' |
1057 (pull and merge or see 'hg help push' for details about pushing new heads) |
1057 (pull and merge or see 'hg help push' for details about pushing new heads) |
1058 [255] |
1058 [20] |
1059 $ cd ../addmarks |
1059 $ cd ../addmarks |
1060 |
1060 |
1061 Check summary output for incoming/outgoing bookmarks |
1061 Check summary output for incoming/outgoing bookmarks |
1062 |
1062 |
1063 $ hg bookmarks -d X |
1063 $ hg bookmarks -d X |