Talked to our son who has used version control software and the problem
appears to be that the users of one branch deleted feqin and then created
it again from outside and added it to version control. Thus the path names
are the same but the ancestry differs. We suspect this is the cause of
the problem and fits the case since the detailed merge output does show
a D on feqin followed by an A on feqin on the following line. Consequently I
will restore my system to its initial state and then try the merge
operations on the problem branch with the --ignore-ancestry flag.
This appears to be the solution.
Should know by tomorrow if this solves the problem-too late to
try it tonight-need to be fresh enough to think clearly:)
Delbert Franz
On Wednesday 27 July 2005 16:41, Delbert Franz wrote:
> I am doing a merge of three branches into a trunk. The repository has
> each branch and the trunk and each branch working copy has its branch plus
> a copy of the trunk when that branch "sprouted". We have been using this
> pattern with success for more than one year now.
>
> After merging the revision interval from the branch repository copy into
> the branch's trunk working copy I do an update from the repository trunk to
> pickup changes made there by previous branches that have been merged into
> their trunk working copy and then committed to the trunk repository copy.
> It is at the update stage from the trunk repository copy to the second
> branch's trunk working copy that I get the response:
>
> svn: REPORT request failed on '/svn/nooksack/!svn/vcc/default'
> svn: Working copy path 'lower/feq/master/feqin' does not exist in respository
>
> The file, feqin, is one that has many changes and needs updating from the
> trunk repository. The problem is that a check with a browser shows that
> in fact the named path, "lower/feq/master/feqin' DOES exist in the trunk
> respository. In fact it exists in all branches as well. This file, as well
> as all others, is a text file. I have excluded binary files from the repository.
>
> This problem happened when using a Windows client at 1.2.0 with a Linux
> server at 1.1.4. Searching the list archives showed some past problems with
> Windows clients. Thus I shifted to using all Linux. The error still occurs
> at the same point in the series of operations with a client at 1.1.3 and
> the server at 1.1.4. The server uses Apache and is on a LAN in my office.
>
> I have exhausted my knowledge of Subversion and could not find this problem
> in a search of the list archives. Many similar problems appeared but were
> asserted to be fixed in 1.1.
>
> The same error message appears when I do: svn status -u, Subversion
> is unable to access the repository copy of the file feqin even though
> a check with a browser shows that the file is present in the repository.
>
> Thanks for any insight into how to get unstuck:)
>
> Delbert Franz
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jul 28 10:40:21 2005