On 10/4/06 10:19 AM, "Mark Phippard" <markp@softlanding.com> wrote:
> Jay Sachs <jay.sachs@riskmetrics.com> wrote on 10/04/2006 09:51:54 AM:
>
>> Some more experimentation. The following command line invocation fails
> with
>> the same error:
>>
>> svn merge --dry-run svn+ssh://svn.rmgapps.
>> com/export/svnroot/appdev/Core/branches/aslack/hashedFilters@9941 \
>> svn+ssh://svn.rmgapps.
>> com/export/svnroot/appdev/Core/branches/aslack/hashedFilters@HEAD
>> /Users/jay/rmg/appdev/Core
>>
>> and this I believe corresponds to the call made by Subclipse to
>> SVNClientInterface::merge().
>>
>> Clearly the shortcut command line option
>>
>> svn merge -r9941:HEAD svn+ssh://svn.rmgapps.
>> com/export/svnroot/appdev/Core/branches/aslack/hashedFilters
>
> Interesting. It implies there might be a problem in the default peg
> revision handling. I still wonder what it is about your merge that is
> triggering the problem. Did the base URL get renamed during this revision
> range?
No, it did not. 9942 was the revision that saw the creation of the branch.
There were several more commits on trunk, one commit to the branch, and then
several more to trunk before I attempted the merge.
The one thing that might be different is our repository layout has the form
/projectA
/trunk
/branches
/user1
/branchX
...
/user2
/branchY
...
/projectB
/trunk
/branches
/user1
/branchZ
...
...
In other words, we inverted "trunk/tags/branches" and projects in the
filesystem hierarchy. But I don't really see how that would affect anything,
they're all just paths.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Wed Oct 4 16:35:24 2006