[darcs-users] An example of a "complicated" change?

Stephen J. Turnbull stephen at xemacs.org
Mon Apr 13 18:00:35 UTC 2009


Daniel Carrera writes:

 > That's an interesting example. It is reasonable to ask "why do you
 > need a merge patch?" After all, I'm not making a new set of changes
 > to the system. I just want to get feature X from Bob.

Well, in fact there is no such thing as a "merge patch" in any of
these systems.  There is a merge revision, usually different from all
of its parents, and it has more than one parent.  So that revision
must be recorded.

This is also an event in history.  The merged in branch is now
superseded by the mainline, and the merge revision records this fact.



More information about the darcs-users mailing list