Re: Merging in Subversion

On Monday 31 January 2011, Waseem Bokhari wrote:
> After a long struggle; Finally I have transferred all my 100 + VSS Projects
> to Subversion in Windows environment.

Congrats! We did the same a few years ago and we never looked back.

> I have strong Branching and Merging requirements for these. I have some
> Qs from you guys:-
>
> . Which Best practices you guys will advice for this?

I'd go for what the online book (see my signature) advises. These are defaults
that fit 98% of all cases. I haven't looked recently, but make sure you
always merge to the same target directory (root of the project) and that you
keep changes atomar so you can merge them separately.

> . What is the scope of merging files in Subversion?

I don't understand this question.

> . Is there any best way to merge files in SVN or you need to
> incorporate any strong merging tool?

Text files are handled well by SVN's builtin merging capabilities. For other
files, I don't know how to merge them. In practice, I consider anything
non-textual as non-mergable, too. This means that merging requires manual aid
(unless the base version of both branches is equal, in that case SVN does the
job automatically) and that the "needs-lock" property is always set.

> . What Tool do you recommend in case of over statement true?

Since you are on MS Windows, I'd suggest TortoiseSVN, but that is not
specifically for merging.

Cheers!

Uli

-- 
ML: http://subversion.apache.org/docs/community-guide/mailing-lists.html
FAQ: http://subversion.apache.org/faq.html
Docs: http://svnbook.red-bean.com/
**************************************************************************************
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.
**************************************************************************************