[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Managing Vendor Branches

From: Greg Troxel <gdt_at_ir.bbn.com>
Date: Mon, 01 Mar 2010 08:33:16 -0500

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

  • application/pgp-signature attachment: stored
Received on 2010-03-01 14:33:51 CET

This is an archived mail posted to the Subversion Users mailing list.