[Python-Dev] I am now lost - committed, pulled, merged, what is "collapse"?

[Antoine Pitrou]

Le lundi 21 mars 2011 à 11:33 -0700, Daniel Stutzbach a écrit :
> On Mon, Mar 21, 2011 at 8:38 AM, Antoine Pitrou <solipsis at pitrou.net>
> wrote:
>         We cannot emulate "svnmerge" for porting between branches,
>         though - and
>         I doubt bzr can do it. That's because merges in common DVCSes
>         are based
>         on the DAG, while svnmerge is a prettily ad-hoc free-form
>         thing.
> 
> 
> The equivalent way to how we had been using svnmerge would be to use
> hg transplant to move patches between branches (and never merging the
> branches).

Yes, this has been discussed several times before the migration.
Using "hg transplant" is seriously suboptimal compared to the model
promoted by a "DAG of changesets"-based DVCS. Also, transplant has its
own weaknesses.

Regards

Antoine.