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

2 repositories, how to branch into one, work there, then merge back?

From: John Owens <john_owens_at_yahoo.com>
Date: Sun, 23 Aug 2009 22:36:46 +0000 (UTC)

I work on a project that's stored on Google Code via svn.
I'd like to do a big change and store that in a local
svn server as I develop it, and then merge the whole big
change back onto Google Code when I'm done (with none of
the intermediate changes visible on Google Code). Didn't
find anything that dealt with the 2-server problem in the
FAQ and the book; sorry if I missed it.

I am guessing this is the sequence; can I get some feedback?

1) On my local repository, set up a svn externals for the
   Google Code repository and check it out. (Is this right?
   If I check in changes, will they go to Google Code or to
   my local repository? I want the latter.)

2) Make changes, checking into my local repository.

3) Keep up to date with changes on the Google Code respository
   with a simple svn update.

4) When I'm done, run a svn merge from my local repository
   with an argument of the Google Code repository to push
   the changes back to Google Code.

Those are I think the steps I want, but I'm unclear if I am
doing the right mechanics to make 'em work.

Also, my local repository is still running 1.4.2; should I be
pushing the admins to upgrade it >= 1.5 before I start this
process? (I know externals got better with 1.5.)

Thanks -



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-08-24 00:38:11 CEST

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

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