[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: strange error with 'merge two different trees'

From: Simon Large <simon.tortoisesvn_at_gmail.com>
Date: Fri, 18 Mar 2011 13:31:56 +0000

On 18 March 2011 13:14, Dave Thompson <kikanaide_at_gmail.com> wrote:
> On Fri, Mar 18, 2011 at 8:26 AM, Simon Large <simon.tortoisesvn_at_gmail.com>
> wrote:
>>
>> How can you get a "not a working copy" message from the repository
>> browser? It is look at the repository, not the working copy.
>>
>> You gave us the URL
>> http://www.bci2000.org/svn/tags/BCI2000.v2.1
>> so if you don't know where that comes from then I certainly don't.
>>
>> Simon
>>
>
> Allow me to rephrase.  That URL
> (http://www.bci2000.org/svn/tags/BCI2000.v2.1) does have a revision 2960.  I
> can check it out from the repository just fine.  I can merge that revision
> into a different SVN using "merge range of revisions."  What I don't
> understand is that if I try to use that URL and revision to merge two
> different trees, it throws "'/svn/!svn/bc/2960/tags/BCI2000.v2.1' path not
> found", and I simply don't understand where that path is coming from.  I
> would think I simply didn't understand what merging two different trees did
> (and would then need to be in the subversion forums), except that I can
> merge from HEAD of that URL, just not from revision 2960.  That path
> ('/svn/!svn/bc/...') looks crazy to me, and I was mostly just curious if
> that's a reasonable sort of path or if it's possible this is a TSVN error.
>
> Does that clarify?

The /svn/!svn/bc/... is internal to the repository which is why it
looks unfamiliar. It's not even very useful as an end user message as
the internal workings are only of interest to the subversion
developers.

It's possible that you have your from and to URLs the wrong way round,
although I can't tell as I don't know what you are merging. But
merging trees is confusing and not very intuitive. I suggest having
another look at the help file and if that doesn't resolve it you need
to provide us with more information about what you are trying to
achieve with this merge operation.

Simon

-- 
:       ___
:  oo  // \\      "De Chelonian Mobile"
: (_,\/ \_/ \     TortoiseSVN
:   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
:   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2712378
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-03-18 14:32:03 CET

This is an archived mail posted to the TortoiseSVN Users mailing list.