You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Erik Anderson/Portsmouth/IBM <er...@us.ibm.com> on 2007/08/15 18:11:25 UTC

automated merging?

I work for a central release engineering team and have been asked to 
develop a way to automate, as much as possible, merges in svn. 

I've been using svnmerge.py in a test environment with the following 
branches:

- trunk for latest development (v2)
- branch for the next release (1.01)
- branch for patching the current release (v1). 

and merge, one way,  from v1 -> v1.01 -> v2.

The only problem I have is the well known rename problem which prevents 
changes from merging:

   http://svn.haxx.se/dev/archive-2005-05/1002.shtml (dev)
   http://svn.haxx.se/users/archive-2006-10/0298.shtml (user)

Questions:

+ Is automating such a process a fantasy (take away the legitimate 
conflict)? 

+ Does anyone have bits to share (preferably in perl)?

+ Does it make more sense to throw this back at the development team 
since they are more likely to know when/where/how code is changing and 
be able to detect things not being merged correctly?