Mercurial > public > mercurial-scm > hg
diff mercurial/commands.py @ 24660:bf13b44bbb0a
bookmarks: show detailed status about incoming bookmarks
Before this patch, "hg incoming -B" shows only difference of bookmarks
between two repositories, and it isn't user friendly.
This patch shows detailed status about incoming bookmarks at "hg
incoming -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 | 51930a7180bd |
| children | 8cf70c97a6e1 |
line wrap: on
line diff
--- a/mercurial/commands.py Wed Apr 08 02:56:19 2015 +0900 +++ b/mercurial/commands.py Wed Apr 08 02:56:19 2015 +0900 @@ -4300,6 +4300,29 @@ .. container:: verbose + With -B/--bookmarks, the result of bookmark comparison between + local and remote repositories is displayed. With -v/--verbose, + status is also displayed for each bookmark like below:: + + BM1 01234567890a added + BM2 1234567890ab advanced + BM3 234567890abc diverged + BM4 34567890abcd changed + + The action taken locally when pulling depends on the + status of each bookmark: + + :``added``: pull will create it + :``advanced``: pull will update it + :``diverged``: pull will create a divergent bookmark + :``changed``: result depends on remote changesets + + From the point of view of pulling behavior, bookmark + existing only in the remote repository are treated as ``added``, + even if it is in fact locally deleted. + + .. container:: verbose + For remote repository, using --bundle avoids downloading the changesets twice if the incoming is followed by a pull.