<div class="gmail_quote">On Mon, Mar 21, 2011 at 8:38 AM, Antoine Pitrou <span dir="ltr"><<a href="mailto:solipsis@pitrou.net">solipsis@pitrou.net</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
<div class="im">We cannot emulate "svnmerge" for porting between branches, though - and</div>
I doubt bzr can do it. That's because merges in common DVCSes are based<br>
on the DAG, while svnmerge is a prettily ad-hoc free-form thing.</blockquote><div><br></div><div>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).</div>
<div><br></div><div>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.</div><div><br></div></div>-- <br>Daniel Stutzbach<br>