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

FUJIWARA Katsunori foozy at lares.dti.ne.jp
Wed Sep 26 04:13:26 CDT 2012

Thank you for your comments, David, Kevin and Laurens.

And sorry for inappropriateness of my question.

> Then, is it natural for native speakers that "diverged remotely" (or
> "remote diverged") is shown even when bookmark is really moved locally ?

In my this question, I supposed that:

  - the revision referred b at remote is contained by local repo,
  - b at remote is not moved, and
  - b at local is switched from rev for b at remote to another on another BRANCH

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 the case omitting step (4) above, our conclusion is showing just
"changed", isn't it ?

[FUJIWARA Katsunori]                             foozy at lares.dti.ne.jp

More information about the Mercurial-devel mailing list