[PATCH 2 of 2 V2] strip: take branch into account when selecting update target (issue5540)

[Paul Morelle]

On 10/10/2017 04:15 AM, Matt Harbison wrote:
> After thinking about this more, I'm not sure what the right behavior
> is.  It sounds like it would be useful to address this and prune at
> the same time in a follow up, without side tracking this.  But I think
> the branch change with an uncommitted merge needs to be fixed here. 
Hello Matt,

Thank you for thinking about this again.
Yes, prune will have to be patched too, using the same strategy, and I
will do that once strip is fixed.
I have added a test for the branch merge case, and the tests are running
right now. I will push a V3 when it's done.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.mercurial-scm.org/pipermail/mercurial-devel/attachments/20171010/69843298/attachment.html>