First of all, it's available at
http://www.orcaware.com/svn/wiki/Svnmerge.py (you might as well get
the trunk version).
Then read under "Development branches", and follow the instructions
there as this is exactly what you want to do.
What it boils down to, is that you should never use "svn merge"
yourself; you should always use "svnmerge.py" and it will just merge
everything that's available that hasn't already been merged.
I think you'll find it quite easy to use. Future versions of SVN are
likely to include this functionality natively.
Noel
On 12/07/07, Adam Tenderholt <a-t...@st...> wrote:
> svnmerge.py was mentioned awhile back for merging different branches.
> Noel, do you want to give some pointers on how to use this script?
> It'd be nice to know a quick and relatively easy way to merge the
> recent test and parser changes back into the orca branch I've created.
>
> Adam
>
>
> -------------------------------------------------------------------------
> This SF.net email is sponsored by DB2 Express
> Download DB2 Express C - the FREE version of DB2 express and take
> control of your XML. No limits. Just data. Click to get it now.
> http://sourceforge.net/powerbar/db2/
> _______________________________________________
> cclib-devel mailing list
> ccl...@li...
> https://lists.sourceforge.net/lists/listinfo/cclib-devel
>
|
