Re: How to merge a part of the whole tree

On Wednesday 14 October 2009, Temeq wrote:
> The original code for the product (this is also our own code) is maintained
> in a vendor branch. When we change some of that code we copy the file from
> vendor branch to trunk (directory structure is maintained) and then do the
> changes.

Wait, the original code contains A, B, C. When you change B, you only create a
fork of B in you 'trunk'? Normally, in particular since copying is cheap, I
would expect you to for the whole original code.

> - This is done because we can now compile the original product and
> our changes to different packages and deliver these both to user how is
> running our changes on top of the original product.

I honestly don't understand what you are trying to say here.

> Now what we would like to do is to bring possible changes from vendor
> branch (current-directory) to our development branch (trunk) when product
> is upgraded -> Trunk may have only few files and directories while the
> original product has thousands of them.

In the beginning, you manually singled out a file from the code base. Merging
changes to that file requires you to do the same, you just manually merge
changes to that file. If you had branched the whole code, you could have also
merged to the whole code.

For the record, we typically do something different here. When upstream
releases a new version, we first upload that into a vendor branch with
svn_load_dirs. Then, we check which of the adaptions that we had locally
still apply to that version and merge those on top of it. IOW, the merging
goes from our branched code to the new vendor branch. Note that we don't keep
a completely unmodified version of the upstream sources around, except as a
tag made by svn_load_dirs.

> Is this possible: merge changes only to the changed files or somehow easily
> discard the tree conflicts? Optimal solution would be if it was somehow
> possible to tell svn to "get changes for files under trunk from differences
> between these two URLs (current and previous version of the original
> product)".

Not really, you can only do it from the other side.

Uli

-- 
ML: http://tortoisesvn.tigris.org/list_etiquette.html
FAQ: http://tortoisesvn.net/faq
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://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2407824
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].