[PATCH 12 of 15 V2] bundle2: support a 'records' mode for the 'bookmarks' part

Augie Fackler raf at durin42.com
Mon Nov 13 18:16:14 EST 2017


> On Nov 13, 2017, at 05:24, Boris Feld <boris.feld at octobus.net> wrote:
> 
> On Fri, 2017-11-10 at 17:43 -0500, Augie Fackler wrote:
>> On Thu, Nov 02, 2017 at 02:18:09PM +0100, Boris Feld wrote:
>>> # HG changeset patch
>>> # User Boris Feld <boris.feld at octobus.net>
>>> # Date 1508246776 -7200
>>> #      Tue Oct 17 15:26:16 2017 +0200
>>> # Node ID 68bbec307c142b6b41893512b1c76320c87c2fa1
>>> # Parent  bd3927325fe48e104b1627e5681ccd09a9a49e44
>>> # EXP-Topic b2.bookmarks
>>> # Available At https://bitbucket.org/octobus/mercurial-devel/
>>> #              hg pull https://bitbucket.org/octobus/mercurial-deve
>>> l/ -r 68bbec307c14
>>> bundle2: support a 'records' mode for the 'bookmarks' part
>>> 
>>> In this mode, the bookmarks changes are record in the
>>> 'bundleoperation' records
>>> instead of inflicted to the repository. This is necessary to use
>>> the part when
>> 
>> s/inflicted/applied/?
>> 
>>> pulling.
>>> 
>> 
>> I'm confused. Why do we not want to apply the part when we're
>> pulling?
>> This log message could use some expansion.
> 
> When pulling, the remote bookmark value is not just applied -as-is-
> into the local repository. There is an extra step to detect bookmark
> divergence. The remote bookmarks data are stored until this processing
> happens.

Ah. That wasn't obvious. Let's make sure that comment makes it into v3 of this series in the commit message.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.mercurial-scm.org/pipermail/mercurial-devel/attachments/20171113/f53542df/attachment.html>


More information about the Mercurial-devel mailing list