[PATCH 2 of 2] bookmarks: show details of difference between local and remote bookmarks

Laurens Holst laurens.nospam at grauw.nl
Wed Sep 26 06:35:45 CDT 2012


Op 26-09-12 11:13, FUJIWARA Katsunori schreef:
> But in the major usecase for bookmark diverging:
>
>    1. BOOKMARK refers revision X in shared(= remote) repo
>    2. Alice pushes newly added revision A to remote, and advances
>       BOOKMARK to A on remote
>    3. Bob also added version B and advanced BOOKMARK to B, so
>    4. Bob pulls revision B from remote, and
>    5. Bob invokes "hg incoming -B"
>
> So, BOOKMARK should be moved on both local and remote side in this
> case: "even when bookmark is really moved LOCALLY"(= switching to
> another BRANCH manually) seems to be rare case and ignorable.
>
>  From David's reply:
>
>      To me, "diverged" indicates that two things moved in different
>      directions from a common point
>
> This fits for "bookmark's moving on both local and remote side" in
> above usecase.
>
> So, showing just "diverged" (without locally/remotely) seems to be
> suitable for this case, doesn't it ?

In step 4 you mean Bub pulls revision *A* from remote, right? This looks 
to be the same scenario as you described in your original mail for 
(diverged), and I think that’s fine.

> In the case omitting step (4) above, our conclusion is showing just
> "changed", isn't it ?

Yup.

~Laurens



More information about the Mercurial-devel mailing list