From users-return-1274-daniel=haxx.se@subversion.apache.org Mon Mar 1 14:33:51 2010 Return-Path: Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by giant.haxx.se (8.14.3/8.14.3/Debian-9) with SMTP id o21DXoNW018240 for ; Mon, 1 Mar 2010 14:33:51 +0100 Received: (qmail 8574 invoked by uid 500); 1 Mar 2010 13:33:45 -0000 Mailing-List: contact users-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list users@subversion.apache.org Received: (qmail 8567 invoked by uid 99); 1 Mar 2010 13:33:45 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Mar 2010 13:33:45 +0000 X-ASF-Spam-Status: No, hits=-1.0 required=10.0 tests=RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: local policy) Received: from [192.1.100.210] (HELO fnord.ir.bbn.com) (192.1.100.210) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Mar 2010 13:33:37 +0000 Received: by fnord.ir.bbn.com (Postfix, from userid 10853) id 2E943564B; Mon, 1 Mar 2010 08:33:16 -0500 (EST) From: Greg Troxel To: Jeff Mott Cc: Stefan Sperling , users@subversion.apache.org Subject: Re: Managing Vendor Branches References: <20100227120033.GB12141@noel.stsp.name> X-Hashcash: 1:20:100301:jeff.mott.or@gmail.com::jWf27i1ar2bcCJjp:0000000000000000000000000000000000000002YCk X-Hashcash: 1:20:100301:users@subversion.apache.org::jWf27i1ar2bcCJjp:00000000000000000000000000000000002kiq X-Hashcash: 1:20:100301:stsp@elego.de::Oc0QFxw21Dry7eUK:0000A/oN Date: Mon, 01 Mar 2010 08:33:16 -0500 In-Reply-To: (Jeff Mott's message of "Sat, 27 Feb 2010 18:32:37 -0800") Message-ID: User-Agent: Gnus/5.110011 (No Gnus v0.11) Emacs/23.1 (berkeley-unix) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha1; protocol="application/pgp-signature" X-Virus-Checked: Checked by ClamAV on apache.org --=-=-= 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 --=-=-= Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (NetBSD) iEYEARECAAYFAkuLwhwACgkQ+vesoDJhHiUl0wCfbPEml41sah64Cers8PQXb4xE OOkAoJ/bYUxvNgUzTbci+Rf1Kmr3hZpy =IvuG -----END PGP SIGNATURE----- --=-=-=--