[darcs-users] Hunk merging and interactive edit

[Ganesh Sittampalam]

On 01/05/2011 16:57, Eric Kow wrote:
> On Thu, Apr 28, 2011 at 22:38:19 +1200, Theam Yong Chew wrote:
>> During darcs record, I would like the edit to be recorded as 2 hunks,
>> so using the "interactive editor" (press e, see final output below
>> [1]), I defined 2 separate operations and then record (press y) the 2
>> hunks into 1 patch.  Unfortunately, my hints through the interactive
>> edit have not had any effect because the 2 separate hunks get merged
>> again.
> 
> ...
> 
>> I know it would've required 2 different patches to highlight this, but
>> often it makes sense to group related hunks into the same patch. This
>> is probably not a straight-forward thing to resolve, since the merging
>> behaviour is often the desired behaviour. What do you suggest I try?
> 
> I believe you're likely out of luck and that the only way to prevent
> this sort of coalescing is by having two separate patches after all.

Yeah, I'm afraid this is the case, at least in terms of interactive edit
itself. It's come up once or twice before, and it would be nice to find
a good UI to make this work, though. Suggestions welcome!

Ganesh