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

[Daniel Stutzbach]

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).

Conversely, the current hg workflow would be similar to committing changes
to the earliest applicable svn branch, then doing a full svnmerge to later
branches.

-- 
Daniel Stutzbach
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.python.org/pipermail/python-dev/attachments/20110321/4f5f7b53/attachment.html>