[darcs-users] Hunk merging and interactive edit
ganesh at earth.li
Mon May 2 05:54:22 UTC 2011
On 02/05/2011 03:27, Stephen J. Turnbull wrote:
> Ganesh Sittampalam writes:
> > On 01/05/2011 16:57, Eric Kow wrote:
> > > 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!
> I believe it's been requested before, but I can see no value in
> recording conceptually separate changes as a single patch.
The main issue here, which is of getting the "right" hunks to be
recorded, is really orthogonal to separating changes. It's important so
that commuting and merging works better later. For example if adding
function Y below X is recorded as an addition of the last bracket of X
plus the body of Y, then merging with insertions into X will leave those
insertions in Y.
More information about the darcs-users