Re: Recipe to reproduce "svn: Working copy path '...' does not exist in repository." problem

"Peter McCurdy" <peter.mccurdy@gmail.com> writes:

> I recently ran into a problem where, when doing a merge, I got my
> working copy into a state where it couldn't commit, and doing "svn up"
> said "svn: Working copy path '...' does not exist in repository."
> Doing a bit of research, I found a link to a bug report on this list
> from last November [1] where no recipe was found for how to reproduce
> the problem.
> Fortunately, I was able to recreate how the problem occurred for us
> with a relatively simple recipe using Subversion 1.2.1 on Linux. It
> could maybe be simplified a little bit, but this is as small as I've
> been able to get it, and is a pretty good reproduction of what
> actually happened to us:
> ~$ svnadmin create /tmp/svn
> ~$ svn co file:///tmp/svn wc
> Checked out revision 0.
> ~$ svn mkdir wc/trunk wc/branch1
> A wc/trunk
> A wc/branch1
> ~$ touch wc/trunk/foo wc/branch1/foo
> ~$ svn add wc/trunk/foo wc/branch1/foo
> A wc/trunk/foo
> A wc/branch1/foo
> ~$ svn ci -m "Initial checkin" wc
> Adding wc/branch1
> Adding wc/branch1/foo
> Adding wc/trunk
> Adding wc/trunk/foo
> Transmitting file data ..
> Committed revision 1.
> ~$ svn mv wc/trunk/foo wc/trunk/bar
> A wc/trunk/bar
> D wc/trunk/foo
> ~$ echo "new file" > wc/trunk/foo
> ~$ svn add wc/trunk/foo
> A wc/trunk/foo
> ~$ svn ci -m "Here comes trouble" wc
> Adding wc/trunk/bar
> Replacing wc/trunk/foo
> Transmitting file data .
> Committed revision 2.
> ~$ svn merge file:///tmp/svn/trunk -r1:2 wc/branch1
> D wc/branch1/foo
> A wc/branch1/foo
> A wc/branch1/bar
> ~$ svn up wc
> svn: Working copy path 'branch1/foo' does not exist in repository
> ~$

Thanks for taking the time to reproduce this. It looks like it has
already been fixed (probably the new replacement code) using trunk I
get:

$ svn merge file://`pwd`/repo/trunk -r1:2 wc/branch1
D wc/branch1/foo
A wc/branch1/foo
A wc/branch1/bar
$ svn st -v wc
                2 2 pm wc
                2 2 pm wc/trunk
                2 2 pm wc/trunk/foo
                2 2 pm wc/trunk/bar
                2 1 pm wc/branch1
R + - 2 pm wc/branch1/foo
A + - 2 pm wc/branch1/bar
$ svn up wc
At revision 2.

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org