subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Ulrich Eckhardt <ulrich.eckha...@dominolaser.com>
Subject Re: ignore ancestry and record only
Date Tue, 02 Oct 2012 07:35:19 GMT
Am 01.10.2012 21:07, schrieb chroyer:
> I was wondering if the following scenario makes sense, or if this is
> asking for problems.
>
>    *  I am regularly merging differences between 2 trees (I won't go in
> too much details here...those tree are not really under my control; I
> put those them in the tags area, and I want to merge the changes between
> 2 consecutive such snapshots. In my case, I can not just use a branch
> and update it with the latest version - the tree gets modifications
> before being tagged).

It's unfortunate that you don't want to go into details here. It sounds 
like a typical "vendor branch" (search the SVN book!). Here, we are 
using several external libraries. When upstreams releases a new version 
(snapshot), we load it into the repository (using svn_load_dirs) and 
then apply some local modifications (like integration into our own build 
system but also bugfixes). When a new version comes in, we do the same, 
merging the changes from the older version if appropriate.


>    *  to merge the differences between 2 snapshots, I am using
> --ignore-ancestry (otherwise I see a lot of files being "replaced").

This might be due to the way that you load the new version.


>    * since --ignore-ancestry makes me loose the merge info, before I
> commit the merge results, I merge again but this time with --record-only
> (and without --ignore-ancestry)
>
>    * now I can commit and it seems that I have the best of both worlds...
[...]
> Does anyone have experience with similar scenario?

I really think that what you are doing is equivalent to maintaining a 
vendor branch. Check the docs, they have examples for this use case, 
and/or provide a bit more info if you still have questions.

Good luck!

Uli


**************************************************************************************
Domino 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.dominolaser.com
**************************************************************************************
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.
Domino Laser GmbH ist für diese Folgen nicht verantwortlich.
**************************************************************************************


Mime
View raw message