[PATCH 2 of 2 V2] histedit: allow histedit --continue when not on a descendant

[Durham Goode]

On 4/7/15 4:14 PM, Augie Fackler wrote:
>
>
> On Apr 7, 2015 6:20 PM, "Durham Goode" <durham at fb.com 
> <mailto:durham at fb.com>> wrote:
> >
> >
> >
> > On 4/7/15 3:18 PM, Matt Mackall wrote:
> >>
> >> On Mon, 2015-04-06 at 18:50 -0700, Durham Goode wrote:
> >>>
> >>> # HG changeset patch
> >>> # User Durham Goode <durham at fb.com <mailto:durham at fb.com>>
> >>> # Date 1428134405 25200
> >>> #      Sat Apr 04 01:00:05 2015 -0700
> >>> # Node ID f884cea9a0edf5e4465c37ee9cba796df0943102
> >>> # Parent  e511ce4fbc848c03986a2a8e740d153cf119b8d1
> >>> histedit: allow histedit --continue when not on a descendant
> >>>
> >>> Previously we would not allow --continue if the current working 
> copy parent was
> >>> not a descendant of the commit produced by the previous histedit 
> step. There's
> >>> nothing really blocking us from continuing the histedit in this 
> situation, so
> >>> let's stop aborting in this case.
> >>>
> >>> In the future we will likely add an 'exec' action to histedit, 
> which means the
> >>> user can do whatever they want during the middle of a histedit 
> (like perhaps
> >>> calling 'hg update'), which means we'll need to support this case 
> eventually
> >>> anyway.
> >>
> >> Is this actually dependent on patch 1?
> >
> > No, it just seemed easier to send them out in series since they're 
> in a related area, and since I tested them when stacked in this order.
>
> One test I'd like to see is what happens if you update to something 
> outside the histedited set.
>
> Maybe we should just chat at the sprint, I'm really in vacation today.
>
K, we can hold onto this series until the sprint.  If you get a chance 
on an airplane or something, you can peek at the whole series to 
formulate an opinion: 
https://bitbucket.org/DurhamG/hg/commits/branch/histedit
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20150407/a7a089d6/attachment.html>