svnmerge and multi module parent pom version updates

2008-02-23 Thread deckrider
We have a number of multi module projects with multiple branches. Unfortunately, this means that every time we use release:prepare release:perform, it updates all the poms, which then appear in another branch (and must be ignored) when we run svnmerge. Is there some technique to easily ignore

Re: svnmerge and multi module parent pom version updates

2008-02-23 Thread Wendy Smoak
On Sat, Feb 23, 2008 at 9:56 AM, deckrider [EMAIL PROTECTED] wrote: We have a number of multi module projects with multiple branches. Unfortunately, this means that every time we use release:prepare release:perform, it updates all the poms, which then appear in another branch (and must be

Re: svnmerge and multi module parent pom version updates

2008-02-23 Thread deckrider
On Sat, Feb 23, 2008 at 10:27 AM, Wendy Smoak [EMAIL PROTECTED] wrote: On Sat, Feb 23, 2008 at 9:56 AM, deckrider [EMAIL PROTECTED] wrote: We have a number of multi module projects with multiple branches. Unfortunately, this means that every time we use release:prepare

Re: svnmerge and multi module parent pom version updates

2008-02-23 Thread Dan Fabulich
Wendy Smoak wrote: What's happening exactly? I'm not familiar with the svnmerge tool. svnmerge.py is what you should use if you intend to merge branches. http://www.orcaware.com/svn/wiki/Svnmerge.py svn merge doesn't really work for anything but the simplest cases; it will be fixed in SVN