[Svnmerge] Experiences with svn/svnmerge; supporting tools around svn/svnmerge

[Piet-Hein Peeters]

Hello,

At Philips HealthCare, we also made a tool that analyzes moves/renames when
doing a merge and we actually managed to develop our own merge-tool. It
handles renames/moves on source and target.  We've solved this by searching
in the log of the repository for the root of each element (in which
revision it was first added). Elements on different branches with the same
root, need to be merged to eachother. For performance reasons we made a
cache of each branch to store the root of every element.

I'm also very interested in the way Horst Hermanns solution.

Here is some information about our tooling.
(See attached file: SubversionMergeTool.pdf)(See attached file:
MaintenanceMergesForMovedFiles.XPB030-080205.01.ppt)

Regards,
Piet-Hein Peeters
Software Configuration Manager
----------------------------------------------------------------------------

Philips Healthcare - Healthcare Informatics / PII
Room QV-136, P.O. Box 10.000, NL - 5680 DA Best
Phone +31 40 27 62016
----------------------------------------------------------------------------


                                                                           
                                                                           
                                                                           
                                                                        To 
                                       svnmerge at orcaware.com               
                                                                        cc 
     David Abrahams                                                        
     <dave at boostpro.com>                                           Subject 
                                       Re: [Svnmerge] Experiences with     
     Sent by:                          svn/svnmerge;supporting tools       
     svnmerge-bounces+pie              around svn/svnmerge                 
     t-hein.peeters=phili                                   Classification 
     ps.com at orcaware.com                                                   
                                                                           
     2008-05-30 06:24 PM                                                   
                                                                           
                                                                           
                                                                           
                                                                           





on Thu May 29 2008, "Hermanns, Horst"
<h.hermanns-+tb+GG71Y8CELgA04lAiVw-AT-public.gmane.org> wrote:

> Hi,
>
> after a few months using Subversion and svnmerge we would like to
> exchange our experiences.
>
> We run into some problems and built some supporting tools around
> svn/svnmerge for managing parallel development and merges between
> branches.

<snip>

> End of our short story about svn/svnmerge. ;-)
>
>
> Perhaps you run into similar problems or found other
> solutions/approaches?
> We are also interested in exchange/enhancements of supporting tools.
>
> Anybody with experiences in subversion 1.5 and the changes to expect?

Care to share your tools with the world?  They sound very useful!

--
Dave Abrahams
BoostPro Computing
http://www.boostpro.com

_______________________________________________
Svnmerge mailing list
Svnmerge at orcaware.com
http://www.orcaware.com/mailman/listinfo/svnmerge
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/svnmerge/attachments/20080602/17ccb1e5/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: graycol.gif
Type: image/gif
Size: 105 bytes
Desc: not available
URL: </pipermail/svnmerge/attachments/20080602/17ccb1e5/attachment-0006.gif>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: pic12923.gif
Type: image/gif
Size: 1255 bytes
Desc: not available
URL: </pipermail/svnmerge/attachments/20080602/17ccb1e5/attachment-0007.gif>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: ecblank.gif
Type: image/gif
Size: 45 bytes
Desc: not available
URL: </pipermail/svnmerge/attachments/20080602/17ccb1e5/attachment-0008.gif>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: SubversionMergeTool.pdf
Type: application/pdf
Size: 216851 bytes
Desc: not available
URL: </pipermail/svnmerge/attachments/20080602/17ccb1e5/attachment-0002.pdf>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: MaintenanceMergesForMovedFiles.XPB030-080205.01.ppt
Type: application/vnd.ms-powerpoint
Size: 226816 bytes
Desc: not available
URL: </pipermail/svnmerge/attachments/20080602/17ccb1e5/attachment-0002.ppt>