equal
deleted
inserted
replaced
425 |
425 |
426 $ hg push http://localhost:$HGPORT2/ |
426 $ hg push http://localhost:$HGPORT2/ |
427 pushing to http://localhost:$HGPORT2/ |
427 pushing to http://localhost:$HGPORT2/ |
428 searching for changes |
428 searching for changes |
429 abort: push creates new remote head c922c0139ca0 with bookmark 'Y'! |
429 abort: push creates new remote head c922c0139ca0 with bookmark 'Y'! |
430 (merge or see "hg help push" for details about pushing new heads) |
430 (merge or see 'hg help push' for details about pushing new heads) |
431 [255] |
431 [255] |
432 $ hg -R ../a book |
432 $ hg -R ../a book |
433 @ 1:0d2164f0ce0d |
433 @ 1:0d2164f0ce0d |
434 * X 1:0d2164f0ce0d |
434 * X 1:0d2164f0ce0d |
435 Y 3:f6fc62dde3c0 |
435 Y 3:f6fc62dde3c0 |
441 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb |
441 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb |
442 $ hg push http://localhost:$HGPORT2/ |
442 $ hg push http://localhost:$HGPORT2/ |
443 pushing to http://localhost:$HGPORT2/ |
443 pushing to http://localhost:$HGPORT2/ |
444 searching for changes |
444 searching for changes |
445 abort: push creates new remote head c922c0139ca0 with bookmark 'Y'! |
445 abort: push creates new remote head c922c0139ca0 with bookmark 'Y'! |
446 (merge or see "hg help push" for details about pushing new heads) |
446 (merge or see 'hg help push' for details about pushing new heads) |
447 [255] |
447 [255] |
448 $ hg -R ../a book |
448 $ hg -R ../a book |
449 @ 1:0d2164f0ce0d |
449 @ 1:0d2164f0ce0d |
450 * X 1:0d2164f0ce0d |
450 * X 1:0d2164f0ce0d |
451 Y 3:f6fc62dde3c0 |
451 Y 3:f6fc62dde3c0 |
731 $ hg push -B X |
731 $ hg push -B X |
732 pushing to $TESTTMP/addmarks (glob) |
732 pushing to $TESTTMP/addmarks (glob) |
733 searching for changes |
733 searching for changes |
734 remote has heads on branch 'default' that are not known locally: a2a606d9ff1b |
734 remote has heads on branch 'default' that are not known locally: a2a606d9ff1b |
735 abort: push creates new remote head 54694f811df9 with bookmark 'X'! |
735 abort: push creates new remote head 54694f811df9 with bookmark 'X'! |
736 (pull and merge or see "hg help push" for details about pushing new heads) |
736 (pull and merge or see 'hg help push' for details about pushing new heads) |
737 [255] |
737 [255] |
738 $ cd ../addmarks |
738 $ cd ../addmarks |
739 |
739 |
740 Check summary output for incoming/outgoing bookmarks |
740 Check summary output for incoming/outgoing bookmarks |
741 |
741 |