[darcs-users] An example of a "complicated" change?
Daniel Carrera
daniel.carrera at theingots.org
Mon Apr 13 17:46:29 UTC 2009
I tested in Mercurial and I could not reproduce the stated behaviour.
Can anyone suggest a different example of a merge that is "complicated"
in a different VCS (e.g. requires more steps or human intervention) but
is simple in Darcs?
Daniel.
Stephen J. Turnbull wrote:
> 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".
>
More information about the darcs-users
mailing list