[darcs-devel] darcs patch: Consolidate make_email and make MIME com... (and 8 more)

David Roundy droundy at abridgegame.org
Sat Nov 20 04:11:32 PST 2004


On Fri, Nov 19, 2004 at 10:16:27PM -0600, Taral wrote:
> On Fri, Nov 19, 2004 at 07:06:43AM -0500, David Roundy wrote:
> > If you're referring to the makefile conflicts, they were all different
> > changes.  Or if you were referring to the mergers, this is the problem with
> > the handling of merge conflicts.  A merger patch has to have enough
> > information to reconstruct the entire conflict history.  Looking at this
> > again is on my TODO list.
> 
> Why not use backreferencing. The first part of the merger is a precise
> copy of a patch that exists in the context...

To be more precise, it's a precise copy of a *portion* of an existing
patch, and that portion doesn't have a name.  Also, it's nice having a
patch contain enough information to determine it's commutation with other
patches.
-- 
David Roundy
http://www.darcs.net
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : http://lists.osuosl.org/pipermail/darcs-devel/attachments/20041120/9bb33749/attachment.pgp


More information about the darcs-devel mailing list