[darcs-users] Hunk merging and interactive edit

Eric Kow kowey at darcs.net
Sun May 1 15:57:50 UTC 2011

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.

Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow>
For a faster response, try +44 (0)1273 64 2905 or
xmpp:kowey at jabber.fr (Jabber or Google Talk only)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-users/attachments/20110501/15ad0971/attachment.asc>

More information about the darcs-users mailing list