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

Re: Branching & merging an external repository

From: Michael Schuerig <michael_at_schuerig.de>
Date: 2005-09-25 01:10:32 CEST

On Sunday 25 September 2005 00:58, Ryan Schmidt wrote:
> On Sep 24, 2005, at 18:19, Michael Schuerig wrote:
> > I'm working on a project where I rely on a third party framework.
> > My own
> > project as well as the framework are kept in their own subversion
> > repositories. I have linked in the framework as an external and am
> > tracking its HEAD version.
> >
> > As a complication I have changed the framework in several places.
> > Updates are merged in or result in conflicts, that's fine as it is.
> > What I'm scratching my head about is how to keep my changes under
> > version control. I haven't found a way to do this, but my
> > subversion skills are only somewhat basic. As I'm routinely
> > updating the framework
> > from its repository, I'm looking for an easy, automatic procedure.
>
> Have you already looked at Vendor Branches?
>
> http://svnbook.red-bean.com/en/1.1/ch07s05.html
>
> It's not automatic, but I'm not sure if anything automatic exists for
> what you want to do.

Yes, using vendor branches was my first idea. But using them daily means
that I'd either have to go through an error-prone manual process or
that I'd have to spend more time than I currently have on automating
it. At any rate, when using a vendor branch, I'm essentially ignoring
that the external framework is under subversion control itself. It
feels wrong not to take advantage of this.

Michael

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Sep 25 01:12:08 2005

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