Show More
@@ -448,6 +448,121 b' hgweb' | |||||
448 |
|
448 | |||
449 | $ cd .. |
|
449 | $ cd .. | |
450 |
|
450 | |||
|
451 | Test to show result of bookmarks comparision | |||
|
452 | ||||
|
453 | $ mkdir bmcomparison | |||
|
454 | $ cd bmcomparison | |||
|
455 | ||||
|
456 | $ hg init source | |||
|
457 | $ hg -R source debugbuilddag '+2*2*3*4' | |||
|
458 | $ hg -R source log -G --template '{rev}:{node|short}' | |||
|
459 | o 4:e7bd5218ca15 | |||
|
460 | | | |||
|
461 | | o 3:6100d3090acf | |||
|
462 | |/ | |||
|
463 | | o 2:fa942426a6fd | |||
|
464 | |/ | |||
|
465 | | o 1:66f7d451a68b | |||
|
466 | |/ | |||
|
467 | o 0:1ea73414a91b | |||
|
468 | ||||
|
469 | $ hg -R source bookmarks -r 0 SAME | |||
|
470 | $ hg -R source bookmarks -r 0 ADV_ON_REPO1 | |||
|
471 | $ hg -R source bookmarks -r 0 ADV_ON_REPO2 | |||
|
472 | $ hg -R source bookmarks -r 0 DIFF_ADV_ON_REPO1 | |||
|
473 | $ hg -R source bookmarks -r 0 DIFF_ADV_ON_REPO2 | |||
|
474 | $ hg -R source bookmarks -r 1 DIVERGED | |||
|
475 | ||||
|
476 | $ hg clone -U source repo1 | |||
|
477 | ||||
|
478 | (test that incoming/outgoing exit with 1, if there is no bookmark to | |||
|
479 | be excahnged) | |||
|
480 | ||||
|
481 | $ hg -R repo1 incoming -B | |||
|
482 | comparing with $TESTTMP/bmcomparison/source | |||
|
483 | searching for changed bookmarks | |||
|
484 | no changed bookmarks found | |||
|
485 | [1] | |||
|
486 | $ hg -R repo1 outgoing -B | |||
|
487 | comparing with $TESTTMP/bmcomparison/source | |||
|
488 | searching for changed bookmarks | |||
|
489 | no changed bookmarks found | |||
|
490 | [1] | |||
|
491 | ||||
|
492 | $ hg -R repo1 bookmarks -f -r 1 ADD_ON_REPO1 | |||
|
493 | $ hg -R repo1 bookmarks -f -r 2 ADV_ON_REPO1 | |||
|
494 | $ hg -R repo1 bookmarks -f -r 3 DIFF_ADV_ON_REPO1 | |||
|
495 | $ hg -R repo1 bookmarks -f -r 3 DIFF_DIVERGED | |||
|
496 | $ hg -R repo1 -q --config extensions.mq= strip 4 | |||
|
497 | $ hg -R repo1 log -G --template '{node|short} ({bookmarks})' | |||
|
498 | o 6100d3090acf (DIFF_ADV_ON_REPO1 DIFF_DIVERGED) | |||
|
499 | | | |||
|
500 | | o fa942426a6fd (ADV_ON_REPO1) | |||
|
501 | |/ | |||
|
502 | | o 66f7d451a68b (ADD_ON_REPO1 DIVERGED) | |||
|
503 | |/ | |||
|
504 | o 1ea73414a91b (ADV_ON_REPO2 DIFF_ADV_ON_REPO2 SAME) | |||
|
505 | ||||
|
506 | ||||
|
507 | $ hg clone -U source repo2 | |||
|
508 | $ hg -R repo2 bookmarks -f -r 1 ADD_ON_REPO2 | |||
|
509 | $ hg -R repo2 bookmarks -f -r 1 ADV_ON_REPO2 | |||
|
510 | $ hg -R repo2 bookmarks -f -r 2 DIVERGED | |||
|
511 | $ hg -R repo2 bookmarks -f -r 4 DIFF_ADV_ON_REPO2 | |||
|
512 | $ hg -R repo2 bookmarks -f -r 4 DIFF_DIVERGED | |||
|
513 | $ hg -R repo2 -q --config extensions.mq= strip 3 | |||
|
514 | $ hg -R repo2 log -G --template '{node|short} ({bookmarks})' | |||
|
515 | o e7bd5218ca15 (DIFF_ADV_ON_REPO2 DIFF_DIVERGED) | |||
|
516 | | | |||
|
517 | | o fa942426a6fd (DIVERGED) | |||
|
518 | |/ | |||
|
519 | | o 66f7d451a68b (ADD_ON_REPO2 ADV_ON_REPO2) | |||
|
520 | |/ | |||
|
521 | o 1ea73414a91b (ADV_ON_REPO1 DIFF_ADV_ON_REPO1 SAME) | |||
|
522 | ||||
|
523 | ||||
|
524 | (test that difference of bookmarks between repositories are fully shown) | |||
|
525 | ||||
|
526 | $ hg -R repo1 incoming -B repo2 -v | |||
|
527 | comparing with repo2 | |||
|
528 | searching for changed bookmarks | |||
|
529 | ADD_ON_REPO2 66f7d451a68b | |||
|
530 | ADV_ON_REPO2 66f7d451a68b | |||
|
531 | DIFF_ADV_ON_REPO2 e7bd5218ca15 | |||
|
532 | DIFF_DIVERGED e7bd5218ca15 | |||
|
533 | DIVERGED fa942426a6fd | |||
|
534 | $ hg -R repo1 outgoing -B repo2 -v | |||
|
535 | comparing with repo2 | |||
|
536 | searching for changed bookmarks | |||
|
537 | ADD_ON_REPO1 66f7d451a68b | |||
|
538 | ADD_ON_REPO2 | |||
|
539 | ADV_ON_REPO1 fa942426a6fd | |||
|
540 | DIFF_ADV_ON_REPO1 6100d3090acf | |||
|
541 | DIFF_ADV_ON_REPO2 1ea73414a91b | |||
|
542 | DIFF_DIVERGED 6100d3090acf | |||
|
543 | DIVERGED 66f7d451a68b | |||
|
544 | ||||
|
545 | $ hg -R repo2 incoming -B repo1 -v | |||
|
546 | comparing with repo1 | |||
|
547 | searching for changed bookmarks | |||
|
548 | ADD_ON_REPO1 66f7d451a68b | |||
|
549 | ADV_ON_REPO1 fa942426a6fd | |||
|
550 | DIFF_ADV_ON_REPO1 6100d3090acf | |||
|
551 | DIFF_DIVERGED 6100d3090acf | |||
|
552 | DIVERGED 66f7d451a68b | |||
|
553 | $ hg -R repo2 outgoing -B repo1 -v | |||
|
554 | comparing with repo1 | |||
|
555 | searching for changed bookmarks | |||
|
556 | ADD_ON_REPO1 | |||
|
557 | ADD_ON_REPO2 66f7d451a68b | |||
|
558 | ADV_ON_REPO2 66f7d451a68b | |||
|
559 | DIFF_ADV_ON_REPO1 1ea73414a91b | |||
|
560 | DIFF_ADV_ON_REPO2 e7bd5218ca15 | |||
|
561 | DIFF_DIVERGED e7bd5218ca15 | |||
|
562 | DIVERGED fa942426a6fd | |||
|
563 | ||||
|
564 | $ cd .. | |||
|
565 | ||||
451 |
Pushing |
|
566 | Pushing a bookmark should only push the changes required by that | |
452 |
|
|
567 | bookmark, not all outgoing changes: | |
453 |
|
|
568 | $ hg clone http://localhost:$HGPORT/ addmarks |
General Comments 0
You need to be logged in to leave comments.
Login now