I haven't initialized it for that direction. In a lot of ways, svnmerge is far less useful in that case because there are many more things going on the trunk that you don't want in the branch than vice versa.
I think in this case, a vanilla 'svn merge' (i.e. not using svnmerge.py) is probably going to be easier. See here http://svnbook.red-bean.com/en/1.4/svn.branchmerge.copychanges.html Cheers, Mike John Hunter wrote: > On Sat, May 17, 2008 at 4:40 PM, John Hunter <[EMAIL PROTECTED]> wrote: > > >> - Michael advises making the change on the branch and committing >> it. Make sure you svn upped on the trunk and have no local >> modifications, and then from the svn trunk do >> > > ichael -- what if someone has already made a change on the trunk and > wants to merge it to the branch with svnmerge? What is the > recommended way to do this? Can they simply go to the branch and do > 'svnmerge.py merge'? > > JDH > > ------------------------------------------------------------------------- > This SF.net email is sponsored by: Microsoft > Defy all challenges. Microsoft(R) Visual Studio 2008. > http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ > _______________________________________________ > Matplotlib-devel mailing list > Matplotlib-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/matplotlib-devel > ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ _______________________________________________ Matplotlib-devel mailing list Matplotlib-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/matplotlib-devel
