Mercurial > hg

comparison tests/test-bookmarks-pushpull.t @ 24661:8cf70c97a6e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bookmarks: show detailed status about outgoing bookmarks Before this patch, "hg outgoing -B" shows only difference of bookmarks between two repositories, and it isn't user friendly. This patch shows detailed status about outgoing bookmarks at "hg outgoing -B". To avoid breaking backward compatibility with other tool chains, this patch shows status, only if --verbose is specified,
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Wed, 08 Apr 2015 02:56:19 +0900
parents bf13b44bbb0a
children ddf99471e023
comparison
equal deleted inserted replaced
24660:bf13b44bbb0a 24661:8cf70c97a6e1
532 DIFF_DIVERGED e7bd5218ca15 changed 532 DIFF_DIVERGED e7bd5218ca15 changed
533 DIVERGED fa942426a6fd diverged 533 DIVERGED fa942426a6fd diverged
534 $ hg -R repo1 outgoing -B repo2 -v 534 $ hg -R repo1 outgoing -B repo2 -v
535 comparing with repo2 535 comparing with repo2
536 searching for changed bookmarks 536 searching for changed bookmarks
537 ADD_ON_REPO1 66f7d451a68b 537 ADD_ON_REPO1 66f7d451a68b added
538 ADD_ON_REPO2 538 ADD_ON_REPO2 deleted
539 ADV_ON_REPO1 fa942426a6fd 539 ADV_ON_REPO1 fa942426a6fd advanced
540 DIFF_ADV_ON_REPO1 6100d3090acf 540 DIFF_ADV_ON_REPO1 6100d3090acf advanced
541 DIFF_ADV_ON_REPO2 1ea73414a91b 541 DIFF_ADV_ON_REPO2 1ea73414a91b changed
542 DIFF_DIVERGED 6100d3090acf 542 DIFF_DIVERGED 6100d3090acf changed
543 DIVERGED 66f7d451a68b 543 DIVERGED 66f7d451a68b diverged
544 544
545 $ hg -R repo2 incoming -B repo1 -v 545 $ hg -R repo2 incoming -B repo1 -v
546 comparing with repo1 546 comparing with repo1
547 searching for changed bookmarks 547 searching for changed bookmarks
548 ADD_ON_REPO1 66f7d451a68b added 548 ADD_ON_REPO1 66f7d451a68b added
551 DIFF_DIVERGED 6100d3090acf changed 551 DIFF_DIVERGED 6100d3090acf changed
552 DIVERGED 66f7d451a68b diverged 552 DIVERGED 66f7d451a68b diverged
553 $ hg -R repo2 outgoing -B repo1 -v 553 $ hg -R repo2 outgoing -B repo1 -v
554 comparing with repo1 554 comparing with repo1
555 searching for changed bookmarks 555 searching for changed bookmarks
556 ADD_ON_REPO1 556 ADD_ON_REPO1 deleted
557 ADD_ON_REPO2 66f7d451a68b 557 ADD_ON_REPO2 66f7d451a68b added
558 ADV_ON_REPO2 66f7d451a68b 558 ADV_ON_REPO2 66f7d451a68b advanced
559 DIFF_ADV_ON_REPO1 1ea73414a91b 559 DIFF_ADV_ON_REPO1 1ea73414a91b changed
560 DIFF_ADV_ON_REPO2 e7bd5218ca15 560 DIFF_ADV_ON_REPO2 e7bd5218ca15 advanced
561 DIFF_DIVERGED e7bd5218ca15 561 DIFF_DIVERGED e7bd5218ca15 changed
562 DIVERGED fa942426a6fd 562 DIVERGED fa942426a6fd diverged
563 563
564 $ cd .. 564 $ cd ..
565 565
566 Pushing a bookmark should only push the changes required by that 566 Pushing a bookmark should only push the changes required by that
567 bookmark, not all outgoing changes: 567 bookmark, not all outgoing changes: