Works for me now, but I can't give it a good test until I have actual
changes to merge.
Ryan
On Mon, Aug 24, 2009 at 7:53 AM, Michael Droettboom <md...@stsci.edu> wrote:
> Just catching up with mail now. Is this still a problem for either Ryan or
> Jouni? It seems to work for me as well. All I can suggest is making sure
> the working copy of the trunk is fully updated (but I'm sure you've thought
> of that already).
>
> > svnmerge avail
> svnmerge: multiple sources found. Explicit source argument (-S/--source)
> required.
> The merge sources available are:
> /branches/v0_99_maint
> /branches/mathtex
> /branches/v0_98_5_maint
>
>
> John Hunter wrote:
>
>> 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
>>
>>
>
> --
> Michael Droettboom
> Science Software Branch
> Operations and Engineering Division
> Space Telescope Science Institute
> Operated by AURA for NASA
>
>
--
Ryan May
Graduate Research Assistant
School of Meteorology
University of Oklahoma
------------------------------------------------------------------------------
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
