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

Re: Best Practices: Merge from public repository to my own

From: Jody Shumaker <jody.shumaker_at_gmail.com>
Date: 2006-06-07 22:14:50 CEST

On 6/7/06, Raterus <raterus@hotmail.com> wrote:
> "Andy Levy" <andy.levy@gmail.com> wrote in message news:b26be6d90606071215k5710c8f6rd4dd339b13be324c@mail.gmail.com...
> >
> > This is really best asked on the SVN users list as it's not specific
> > to TSVN, but while we're here...
> >
> > Have a read of the "Vendor Branches" section of the Subversion book
> > [1] and let us know if it sounds like it'll work out.
> >
> > [1] http://svnbook.red-bean.com/nightly/en/svn.advanced.vendorbr.html
>
> Thanks Andy, that's exactly what I was looking for
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
> For additional commands, e-mail: users-help@tortoisesvn.tigris.org
>
>

You also might want to look into svnmerge.py which will eventually be
replaced by an official svnmerge app. Makes it easier to track what
revisions have been merged, so updating from the vendor's repository
could be as simple as `svnmerge.py merge`, resolve conflicts, commit.

- Jody

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Wed Jun 7 22:14:59 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.