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

David M. Carr david at carrclan.us
Tue Sep 25 14:16:52 CDT 2012

On Tue, Sep 25, 2012 at 12:07 PM, Kevin Bullock
<kbullock+mercurial at ringworld.org> wrote:
> On Sep 25, 2012, at 10:37 AM, David M. Carr wrote:
>> On Tue, Sep 25, 2012 at 11:05 AM, FUJIWARA Katsunori
>> <foozy at lares.dti.ne.jp> wrote:
>>> Then, is it natural for native speakers that "diverged remotely" (or
>>> "remote diverged") is shown even when bookmark is really moved locally ?
>> Not in my opinion.  To me, "diverged" indicates that two things moved
>> in different directions from a common point.  If the remote bookmark
>> stayed the same but the local bookmark moved, I don't think this
>> should be called "diverged".  I'd prefer "changed" or "different".
> If the remote bookmark stayed the same but local moved, they wouldn't be divergent. That would be the 'advanced locally' case.
> pacem in terris / мир / शान्ति / ‎‫سَلاَم‬ / 平和
> Kevin R. Bullock

My impression was that this question was in the context of the
"remote bookmark not in the local repository" case, which is where
this verbiage was a proposed alternative.  Consider the scenario:
- bookmark B1 points to rev R1 both locally and remotely
- user forces B1 to point to R2 (something not an ancestor of R1) locally
- user strips R1
- user runs "hg incoming"

At this point, the local moved, and the remote didn't.  Conceptually,
you are correct in saying that this is the "advanced locally" case.
However, the patch description proposed that if the revision for the
remote bookmark isn't in the local repository, an alternate message is
shown because it isn't cost effective to determine the true
relationship.  Thus, the question becomes what to display when we
don't really know whether it advanced locally vs. advanced remotely
vs. diverged.

David M. Carr
david at carrclan.us

More information about the Mercurial-devel mailing list