Thread: [matplotlib-devel] Merge tracking of v0_99_maint broken?

I fixed some doc typos on the v0_99_maint branch and was going to merge
the fixes to the trunk, but it didn't work:

% svnmerge.py avail -S v0_99_maint
svnmerge: "v0_99_maint" is neither a valid URL, nor an unambiguous substring of a repository path, nor a working directory
% svnmerge.py avail               
svnmerge: multiple sources found. Explicit source argument (-S/--source) required.
The merge sources available are:
  /branches/mathtex
  /branches/v0_91_maint
  /branches/v0_98_5_maint

I'm pretty sure that this used to work. What has changed in the repository?

-- 
Jouni K. Seppänen
http://www.iki.fi/jks

On Sat, Aug 22, 2009 at 3:01 AM, Jouni K. Seppänen <jk...@ik...> wrote:

> I fixed some doc typos on the v0_99_maint branch and was going to merge
> the fixes to the trunk, but it didn't work:
>
> % svnmerge.py avail -S v0_99_maint
> svnmerge: "v0_99_maint" is neither a valid URL, nor an unambiguous
> substring of a repository path, nor a working directory
> % svnmerge.py avail
> svnmerge: multiple sources found. Explicit source argument (-S/--source)
> required.
> The merge sources available are:
>  /branches/mathtex
>  /branches/v0_91_maint
>  /branches/v0_98_5_maint
>
> I'm pretty sure that this used to work. What has changed in the repository?


Same behavior here. I had been having trouble doing any merges, but never
had tracked it down.  I guess this is related.

Ryan

-- 
Ryan May
Graduate Research Assistant
School of Meteorology
University of Oklahoma
Sent from Los Angeles, California, United States

On Sat, Aug 22, 2009 at 3:24 AM, Ryan May<rm...@gm...> 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

On Sat, Aug 22, 2009 at 3:24 AM, Ryan May <rm...@gm...> wrote:

>
>
> On Sat, Aug 22, 2009 at 3:01 AM, Jouni K. Seppänen <jk...@ik...> wrote:
>
>> I fixed some doc typos on the v0_99_maint branch and was going to merge
>> the fixes to the trunk, but it didn't work:
>>
>> % svnmerge.py avail -S v0_99_maint
>> svnmerge: "v0_99_maint" is neither a valid URL, nor an unambiguous
>> substring of a repository path, nor a working directory
>> % svnmerge.py avail
>> svnmerge: multiple sources found. Explicit source argument (-S/--source)
>> required.
>> The merge sources available are:
>>  /branches/mathtex
>>  /branches/v0_91_maint
>>  /branches/v0_98_5_maint
>>
>> I'm pretty sure that this used to work. What has changed in the
>> repository?
>
>
> Same behavior here. I had been having trouble doing any merges, but never
> had tracked it down.  I guess this is related.
>

Just to follow up and put in the archives for anyone searching.  It looks
like the svnmerge.py script was updated at some point since the last time I
downloaded it (probably to keep in sync with changes in SVN itself).  I was
having problems merging today, but updating to this latest version solved
all the problems.

Just FYI.

Ryan

-- 
Ryan May
Graduate Research Assistant
School of Meteorology
University of Oklahoma
Sent from Norman, Oklahoma, United States

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<rm...@gm...> 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
> Mat...@li...
> 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

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...@st...> 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<rm...@gm...> 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
>> Mat...@li...
>> 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

svnmerge avail -S v0_99_maint works for me now, so it looks like the
problem has been fixed. -Jouni

Ryan May <rm...@gm...> writes:

> 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...@st...> 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<rm...@gm...> 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
>>> Mat...@li...
>>> 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
>>
>>

-- 
Jouni K. Seppänen
http://www.iki.fi/jks