> Can anyone give me an example of one such merge that is "complicated" in a
> different VCS (e.g. requires several steps, or human intervention) but is
> simple in Darcs?

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.

guillaume
_______________________________________________
darcs-users mailing list
darcs-users@darcs.net
http://lists.osuosl.org/mailman/listinfo/darcs-users

Reply via email to