Re: merge problem with Tortoise

On Thursday 30 July 2009, Ilan Yaniv wrote:
> We have a merge problem. When we are merging a revision from one branch
> to the trunk and selecting one file to merge in fact a bunch of files
> get merge, and then we have to make a revert to the files that we don't
> want to merge.

If you only want to merge a single file, you should not select the branch as
source and the trunk as target but individually pick the file therein.

However, there is one big argument against this, and that is merge tracking
which will become more difficult. The point is that then, the merge history
of that file will be different than the rest of the trunk, so it will receive
its own svn:mergeinfo property. This means that the next time you merge to
trunk, this file's svn:mergeinfo will also be changed, which is not harmful
but confusing and annoying.

Suggestion:
For the case at hand, either merge the few changes manually (i.e. discard the
merge history) or undo the changed merge history. This means that you can't
tell that parts of the revision were merged. You can also mark the whole
revision as merged, though that is a bit of a lie, because only parts of it
were merged. There is no solution, you will have to pick the lesser of three
evils.

For the future, try to separate changes, so that each change that can be
applied separately gets its own revision. The problems described above
(including the desire to only merge parts of a revision) then shouldn't come
up in the first place.

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