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

On Monday 24 August 2009, John Owens wrote:
> 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).

Why shouldn't the intermediate changes be visible? I find smaller steps easier
to understand and someone suggesting a giant, monolithic patch will have a
hard time getting it accepted upstream.

> 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.)

The changes will be committed externally, so this doesn't work.

Options:

0. Get access upstream. This is actually the preferred way IMHO, because it
integrates with upstream's development. Changes are seen earlier and, if
necessary, vetoed earlier, too.

1. Check out svn_load_dirs. This script takes a sourcetree and imports/updates
it into a repository. This is used for tracking vendor branches, which is
effectively what you want.

2. http://bitbucket.org/nikhilm/cq/src/tip/README
This is pretty similar to option 1, but it uses a different repository for
the local changes. The main advantage is the offline work, not so much the
independence from the upstream repository. I just added this here for
completeness, because I'm not 100% sure what your goals are.

Uli

-- 
ML: http://subversion.tigris.org/mailing-list-guidelines.html
FAQ: http://subversion.tigris.org/faq.html
Docs: http://svnbook.red-bean.com/
Sator Laser GmbH
Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932
**************************************************************************************
Sator Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland
Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932
**************************************************************************************
           Visit our website at <http://www.satorlaser.de/>
**************************************************************************************
Diese E-Mail einschließlich sämtlicher Anhänge ist nur für den Adressaten bestimmt und kann vertrauliche Informationen enthalten. Bitte benachrichtigen Sie den Absender umgehend, falls Sie nicht der beabsichtigte Empfänger sein sollten. Die E-Mail ist in diesem Fall zu löschen und darf weder gelesen, weitergeleitet, veröffentlicht oder anderweitig benutzt werden.
E-Mails können durch Dritte gelesen werden und Viren sowie nichtautorisierte Änderungen enthalten. Sator Laser GmbH ist für diese Folgen nicht verantwortlich.
**************************************************************************************
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2386668
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].