Re: how to work more efficiently

On Tuesday 13 November 2007, Danny De Koster wrote:
> First of all I have my standard source code in a directory which in under
> Subversion. Let's say /usr/standard_src/source.4gl
>
> Then I have in another directory almost the same source code of a
> particular program. This is not under Subversion. Let's say
> /usr/customer_src/source.4gl

Just that I understand you correctly: you have some sourcecode in a Subversion
repository (this is the main branch or 'trunk'). Further, you have some other
sourcecode that is derived from that sourcecode but _not_ in the repository.

BTW: if /usr/standard_src is a path in your (Unix/Linux) filesystem, I'd say
this doesn't belong there. If it's a path in your repository the name is
maybe a bit unlucky because it might cause confusion. At least I was confused
when I read it.

> In there I needed to do some modifications special for the customer

This would be a branch of the mainline sourcecode.

> Now I want to work more efficiently and want to heritance the new
> modification of /usr/standard_src/source.4gl into
> /usr/customer_src/source.4gl and keep as much as possible my changes of my
> customer.

This is called merging changes between branches.

> How do I proceed??? I studied the manual of Subversion about branches...but
> I don't really understand how to proceed.

First thing that you do is create a branch from your sourcecode so that the
customer-specific parts are under Subversion, too. Then, you can use SVN's
merging feature to apply changes from the trunk to the branch or vice versa.

I would say that this is exactly what described in the book though, so I'm
a bit puzzled where the problems lie. Maybe it is that there is some
misunderstanding between us concerning what you actually want otherwise you
might want to be more explicit which parts you don't understand.

HTH

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: Michael Wöhrmann, 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.
**************************************************************************************
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org