On Mon, Mar 21, 2011 at 8:38 AM, Antoine Pitrou <solip...@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
_______________________________________________ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
