[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

automated merging?

From: Erik Anderson/Portsmouth/IBM <erik_anderson_at_us.ibm.com>
Date: 2007-08-15 20:11:25 CEST

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?
Received on Wed Aug 15 22:50:52 2007

This is an archived mail posted to the Subversion Users mailing list.