[PATCH 1 of 2] merge: rename p1 to wctx in manifestmerge

Bryan O'Sullivan bos at serpentine.com
Sat Feb 9 15:30:39 CST 2013


On Sat, Feb 9, 2013 at 1:28 PM, Mads Kiilerich <mads at kiilerich.com> wrote:

> I would like to go in the opposite direction and make manifestmerge more
> symmetric and independent of wctx and strategy for applying changes to a
> working directory. That would bring it closer to being usable for in memory
> merge.
>

That makes sense. I still applied the patch for now - when you have time to
work on improving its symmetry, please feel free to change the name back.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20130209/019c5d0e/attachment.html>


More information about the Mercurial-devel mailing list