Josh Glover wrote:
> Quoth Max Bowsher (Mon 2004-07-26 08:45:29PM +0100):
>
>> Josh Glover wrote:
>
>>> Finally, I was ready to commit my trunk changes:
>>>
>>>> jmglov@jglover; svn commit -m 'BP160: merged BP_160 branch changes
>> 1862:1888
>>>> back into the trunk'
>>> Adding docs/appserver
>>> Adding docs/appserver/MyProject
>>> Adding (bin) docs/appserver/MyProject/functional-specification.sxw
>>> Adding (bin) docs/appserver/MyProject/technical-specification.sxw
>>> svn: Commit failed (details follow):
>>> svn: Source url '/trunk/docs/appserver' is from different repository
>>>
>>> Can anyone shed some light on this?
>>
>> Please could you run:
>> tar jcvf entdbg.tbz2 `find -name entries`
>> in the working copy in question, and put the resulting tarball on a
>> webserver somewhere?
>
> Can you tell me what we are looking for? This particular repository
> houses a proprietary project, so I have to be careful. Here is the
> docs/appserver/.svn/entries file (with a few names sanitised):
>
> <?xml version="1.0" encoding="utf-8"?>
> <wc-entries
> xmlns="svn:">
> <entry
> name=""
>
url="svn+ssh://svn.mydomain.com/var/svnroot/MyProject/trunk/docs/appserver"
> copied="true"
> kind="dir"
> copyfrom-rev="1889"
> schedule="add"
> revision="1889"
>
>
copyfrom-url="svn+ssh://svn.mydomain.com/var/svnroot/MyProject/branches/BP_1
60/docs/appserver"/>
> <entry
> name="MyProject"
> copied="true"
> kind="dir"
> copyfrom-rev="1889"
> schedule="add"
>
>
copyfrom-url="svn+ssh://svn.mydomain.com/var/svnroot/MyProject/branches/BP_1
60/docs/appserver/MyProject"/>
> </wc-entries>
>
> Nothing looks terribly out of wack to me, but if I was an expert, I
> wouldn't be asking this question. ;)
>
> Max, if you can be more specific, that would help me.
I'm not entirely sure what we are looking for.
Here is a list of things to check:
*All* URLs within .svn/entries files begin with
"svn+ssh://svn.mydomain.com/var/svnroot/MyProject/"
In the filesystem, directory /var/svnroot/MyProject *does* contain:
- directories:
conf
dav
db
hooks
locks
- files:
format
README.txt
and *nothing else*.
Max.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Jul 27 12:07:19 2004