[PATCH stable] rebase: derive node from target rev (issue3802)

Kevin Bullock kbullock+mercurial at ringworld.org
Mon Feb 4 14:18:55 CST 2013


On Feb 4, 2013, at 2:15 PM, Pierre-Yves David wrote:

> On Sun, Feb 03, 2013 at 03:47:29PM -0800, Siddharth Agarwal wrote:
>> On 02/03/2013 03:40 PM, Pierre-Yves David wrote:
>>> Can't that be just `dest = repo[target]` that would remove needs to update
>>> other code part. making the change smaller and safer.
>> 
>> That was the other way to fix this I had in mind. I mildly prefer
>> this because that would have one path derive target from dest and
>> one derive dest from target, and I thought that was even more
>> confusing than this.
> 
> meh, given the current state of the rebase code I would have prefered a patch
> that change as few as possible of existing code.
> 
> The regression here is serious enough.
> 
> Kevin seems to have crewed it as is anyway.

There's a balance to be struck here between minimizing churn and easing understanding of this rat's nest for whoever next tries to refactor it. It's thus a bit of a toss-up for me as to whether this or the alternate solution is preferable.

pacem in terris / мир / शान्ति / ‎‫سَلاَم‬ / 平和
Kevin R. Bullock



More information about the Mercurial-devel mailing list