From users-return-6848-apmail-subversion-users-archive=subversion.apache.org@subversion.apache.org Thu Jan 06 16:43:59 2011 Return-Path: Delivered-To: apmail-subversion-users-archive@minotaur.apache.org Received: (qmail 93538 invoked from network); 6 Jan 2011 16:43:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 6 Jan 2011 16:43:59 -0000 Received: (qmail 67652 invoked by uid 500); 6 Jan 2011 16:43:59 -0000 Delivered-To: apmail-subversion-users-archive@subversion.apache.org Received: (qmail 67595 invoked by uid 500); 6 Jan 2011 16:43:58 -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 67587 invoked by uid 99); 6 Jan 2011 16:43:58 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Jan 2011 16:43:58 +0000 X-ASF-Spam-Status: No, hits=3.7 required=10.0 tests=FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM,HTML_MESSAGE,RCVD_IN_DNSWL_LOW,RFC_ABUSE_POST,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of nonot100@gmail.com designates 209.85.160.43 as permitted sender) Received: from [209.85.160.43] (HELO mail-pw0-f43.google.com) (209.85.160.43) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Jan 2011 16:43:52 +0000 Received: by pwj10 with SMTP id 10so2184577pwj.16 for ; Thu, 06 Jan 2011 08:43:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:in-reply-to :references:date:message-id:subject:from:to:content-type; bh=6s/Mi1JyortU/W6MjcLQi2sPhEwf18SsbnNKXGGu6pU=; b=n7Tp3uaikKT68FHrhkPbLnz/arqp1ZeyL+hvx2nRUm7CHSCfyeL+NsgEA9eYJalRFb JdKj23tWaqLCHf7j8wKPix7Q6N8vWcSzgfbRnPAGFrEqqvfBzLp9QgbQIWyq/GsVGVnk ymNtuLsgfMTSG+c7zDjHTdwyjeR1VJxErGQQU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type; b=O8I2X3iSPzNlTy72lAmnjcr85GCHPYb6WmeGZ2uudG5J1tSg9kIP1YURtNMskI7XJE qM8hs9h4nCuRs4WIN+HblXrhVtJ3GJkON8ybGW5PTNlJNy2YDWvjfMOtqhGZq4QnaIU4 kO1dlki/jMaN5vEyTp6rgmKoF7Ar1rqjoNKIM= MIME-Version: 1.0 Received: by 10.142.232.9 with SMTP id e9mr913391wfh.153.1294332211893; Thu, 06 Jan 2011 08:43:31 -0800 (PST) Received: by 10.142.72.19 with HTTP; Thu, 6 Jan 2011 08:43:31 -0800 (PST) In-Reply-To: <20110105095622.GA23722@ted.stsp.name> References: <20110105095622.GA23722@ted.stsp.name> Date: Thu, 6 Jan 2011 11:43:31 -0500 Message-ID: Subject: Re: Best way to maintain patches to a 3rd party library? From: NN Ott To: Nico Kadel-Garcia , NN Ott , users@subversion.apache.org Content-Type: multipart/alternative; boundary=000e0cd29e02b61831049930330a --000e0cd29e02b61831049930330a Content-Type: text/plain; charset=ISO-8859-1 > > > > > > > I have a source library that I need to periodically import (and then > patch) > > > for use by my code base. > > > > > > The SVN Book seems to reccomend a "vendor branch" scheme where you keep > a > > > patched branch of the "vendor drops". This would work, except that I > loose > > > any history of the library development. (The vendor also uses SVN and > gives > > > read-only access to their repo.) > > > > > The above steps can also semi-automated using svn_load_dirs: > > https://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/svn_load_dirs > > > Stefan, That is what the SVN books recommended, but then I can not access the original commit history of the 3rd-party library. (The other option is to use svn:external and patch manually.) This is exactly the crux of my question: Can I make a local (patched) branch of an svn:external? That way I could pull updates as needed, but still retain access to the full commit history. Thank you --000e0cd29e02b61831049930330a Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable
> >
> > I have a source library that I need to periodically import (and t= hen patch)
> > for use by my code base.
> >
> > The SVN Book seems to reccomend a "vendor branch" schem= e where you keep a
> > patched branch of the "vendor drops". This would work, = except that I loose
> > any history of the=A0library=A0development. =A0(The vendor also u= ses SVN and gives
> > read-only access to their repo.)
>


The above steps can also semi-automated using svn_load_dirs:
https://svn.apache.org/repos/asf/sub= version/trunk/contrib/client-side/svn_load_dirs



Ste= fan,

That is what the SVN books=A0recommended, but= then I can not access the original commit history of the 3rd-party=A0libra= ry.

(The other option is to use svn:external and patch manu= ally.)

This is exactly the crux of my question: = =A0

Can I m= ake a local (patched) branch of an svn:external? =A0That way I could pull u= pdates as needed, but still retain access to the full commit history.

Thank you=A0
--000e0cd29e02b61831049930330a--