Refactor merge code to make single file and/or directory merges easier.

[SVN r68929]

tools/release/2release.bat

@@ -0,0 +1,16 @@
+rem @echo off
+rem Copyright Beman Dawes 2011
+rem Distributed under the Boost Software License, Version 1.0.  See http://www.boost.org/LICENSE_1_0.txt 
+if not %1$==$ goto usage_ok
+echo Usage: 2release path-relative-to-boost-root [svn-options]
+echo Path may be to file or directory
+echo Options include --dry-run
+echo WARNING: The current directory must be the directory in %BOOST_RELEASE%
+echo          specified by the path-relative argument
+goto done
+
+:usage_ok
+svn merge %2 %3 %4 %5 %6 https://svn.boost.org/svn/boost/branches/release/%1 ^
+  https://svn.boost.org/svn/boost/trunk/%1
+
+:done

tools/release/merge2release.bat

@@ -1,4 +1,6 @@
 rem @echo off
+rem Copyright Beman Dawes 2010
+rem Distributed under the Boost Software License, Version 1.0.  See http://www.boost.org/LICENSE_1_0.txt 
 if not %1$==$ goto usage_ok
 echo Usage: merge2release library-name [svn-options]
 echo Options include --dry-run
@@ -7,17 +9,14 @@ goto done
 :usage_ok
 pushd %BOOST_RELEASE%
 pushd boost
-svn merge %2 %3 %4 %5 %6 https://svn.boost.org/svn/boost/branches/release/boost/%1.hpp ^
-  https://svn.boost.org/svn/boost/trunk/boost/%1.hpp
+call 2release boost/%1.hpp %2 %3 %4 %5 %6
 pushd %1
-svn merge %2 %3 %4 %5 %6 https://svn.boost.org/svn/boost/branches/release/boost/%1 ^
-  https://svn.boost.org/svn/boost/trunk/boost/%1
+call 2release boost/%1 %2 %3 %4 %5 %6
+popd
+popd
+pushd libs\%1
+call 2release libs/%1 %2 %3 %4 %5 %6
 popd
 popd
-pushd libs\%1  
-svn merge %2 %3 %4 %5 %6 https://svn.boost.org/svn/boost/branches/release/libs/%1 ^
-  https://svn.boost.org/svn/boost/trunk/libs/%1
-popd 
-popd 
 
 :done