on Mon Aug 27 2007, Beman Dawes <bdawes-AT-acm.org> wrote:
Yes: http://www.orcaware.com/svn/wiki/Svnmerge.py
We just have to mandate that everyone use it.
If I use it on branches where I'm the maintainer, does svnmerge.py work OK for those branches even if others are not using it for other branches? Or do all Boost developers have to do all merges via svnmerge.py.
I don't know.
On my branches, should the rule-of-thumb be "never use the raw SVN merge command or GUI equivalents; always use svnmerge.py"?
Yeah.
The next version of Subversion will make it unnecessary (http://blogs.open.collab.net/svn/2007/05/the_subversion__1.html)
It sounds as if we need a Wiki page describing Boost's preferred (and in some cases mandated) SVN procedures.
Any volunteers to write and maintain such a page?
<ducks>...a bit swamped at the moment...</ducks> -- Dave Abrahams Boost Consulting http://www.boost-consulting.com The Astoria Seminar ==> http://www.astoriaseminar.com