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

Kevin Bullock kbullock+mercurial at ringworld.org
Tue Sep 25 11:07:07 CDT 2012

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

More information about the Mercurial-devel mailing list