On Sat, Aug 22, 2009 at 3:24 AM, Ryan May<rma...@gmail.com> wrote: > Same behavior here. I had been having trouble doing any merges, but never > had tracked it down. I guess this is related.
The following just worked for me svnmerge.py merge -Sv0_99_maint managed to merge almost 15 commits from the branch to the trunk w/ no conflicts despite all the docstring changes, etc. Nice! JDH ------------------------------------------------------------------------------ Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july _______________________________________________ Matplotlib-devel mailing list Matplotlib-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/matplotlib-devel
