You are viewing a plain text version of this content. The canonical link for it is here.

Posted to users@subversion.apache.org by Greg Troxel <gd...@ir.bbn.com> on 2010/03/01 13:33:16 UTC

Re: Managing Vendor Branches

I see you figured this out, but what I do is

initial import:

 import v1 to vendor/v1
 copy vendor/v1 to vendor/trunk
 copy vendor/trunk to trunk

nth import:

 import vN to vendor/vN
 merge --ignore-ancestry vendor/v(N-1) vendor/vN to vendor/trunk
 # note that now we have a vendor branch with stable ancestry
 merge vendor/trunk to trunk