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

Daniel Carrera daniel.carrera at theingots.org
Mon Apr 13 16:25:29 UTC 2009


Guillaume Hoffmann wrote:
> Simple: you have 3 repos A, B and C, A being the "central", B and C
> being "sons" of A.
> 
> Assume B and C have a list of independent changes made above a common
> history present in A. Then, when you want to propagage these histories
> between B and C, you have to create "merge patches" that explicitely
> do the operation. This happens in Git, Mercurial and Bazaar, with Git
> having the advantage of creating the merge patch automatically. So Git
> comes closest to darcs on this task (no extra human intervention).
> 
> At least this is how it worked 6 months ago when I tried these 3 systems.

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.

Later I'll try to turn this into an explicit example (actual files, 
actual patches) so I can go back to it later in the more advanced 
section and show how Darcs does the merge.

Daniel.


More information about the darcs-users mailing list