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 1.5, which is scheduled to be released someday, probably. ;-)

http://www.javaworld.com/javaworld/jw-01-2008/jw-01-svnmerging.html?page=1

The moral of this story is that it should be possible to use the release plugin to increment version numbers without checking in to SCM. I've filed MRELEASE-324 on this.

-Dan

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to