On Mon, 8 Feb 2010, John Horigan wrote:
> Am I expecting too much from hunk editing? Is there some way to get
> darcs to ignore spurious common lines between pristine and working?
Thanks for the feedback - this is a use case I hadn't considered, and it's
not something that hunk editing in its current form can handle. Thinking
about it, it's something I've also occasionally encountered, though
nowhere near as frequently as things like wanting to tease apart two
separate changes or clean up some noise in a patch.
I think what's needed here is some way to ask darcs to merge two hunks,
and then use the hunk editor to split them where you want.
The tricky bit here will be preventing it from turning the end result back
into the original, because there's a "canonization" pass that normally
runs which will have this effect. Normally that's a good thing because it
produces minimal changes, but here it's working against you.
A possibly related use case is when darcs detects a new function as
including the closing curly brace of the previous function instead of its
own closing curly brace.
I've opened a ticket - http://bugs.darcs.net/issue1742
Cheers,
Ganesh
|