[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: Andy Levy <andy.levy_at_gmail.com>
Date: 2006-06-07 21:15:19 CEST

On 6/7/06, Raterus <raterus@hotmail.com> wrote:
> In my development environment, I have a component I am using, which the latest stable version is always available through a public SVN repository.
> I'm trying to create a way, so I can get the latest version from the public repository anytime I want, but be able to keep configuration changes I've made to my local working copy.
> The trick is, I need my local working copy of changes to this component to be stored into my local svn repository, so other developers can get an updated version anytime they need it.
> The only way I know how to do this is, assuming I already have a version of this component imported into my local repository (I'll call this [LocalChanges] in my example)
> 1) Update my working copy of public component [PublicChanges]
> 2) Export [PublicChanges] to [ExportedPublicChanges]
> 3) Import [ExportedPublicChanges] to [LocalChangesBranch] as a branch
> 4) Check out [LocalChangesBranch]
> 5) Merge [LocalChangesBranch] and [LocalChanges], taking care of conflicts that may arise.
> Is this the best/easiest way to do this? Is there a way I can point the public repository url to my local repository and merge like that (I've tried everything I can to actually do this)

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

To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Wed Jun 7 21:17:12 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.