comparison hgext/largefiles/overrides.py @ 24764:4dcd55802237

histedit: allow histedit --continue when not on a descendant (BC) 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. This is technically a BC change, but it is making things more forgiving so I think it's ok. 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.
author Durham Goode <durham@fb.com>
date Sat, 04 Apr 2015 01:00:05 -0700
parents 0974d3a0be29
children 4906dc0e038c
comparison
equal deleted inserted replaced
24763:a698e088ad29 24764:4dcd55802237