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

[Kevin Bullock]

On Sep 25, 2012, at 2:16 PM, David M. Carr wrote:

> 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.

I don't think the word "diverged" was in any way being proposed for the not-in-local case. "changed remotely" also isn't great here, because it may be that nothing has actually been done to the remote repository in the meantime—as in the case you describe below, the (possible) divergence might be due to local history editing.

My suggestion if divergence can't be determined: "differs remotely"

>  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.

Actually, this could be any of the advanced-locally, advanced-remotely, or divergent cases, depending what the graph looks like.

> 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.

pacem in terris / мир / शान्ति / ‎‫سَلاَم‬ / 平和
Kevin R. Bullock

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20120925/1f034387/attachment.html>