Guillaume Hoffmann writes: > > 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.
Maybe in bazaar (I don't use it much so there may be an option to perform and commit the merge automatically), but AFAICS in git this is just "git pull" and in Mercurial it is "hg pull -u" or "hg fetch". _______________________________________________ darcs-users mailing list darcs-users@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-users
