Re: svn: File not found problem

Ben Collins-Sussman <sussman@collab.net> writes:

> Your recipe is unclear to me; did developer B commit the deletion
> before developer A tried to commit the edits? That's what I'm guessing.

Sorry for the lack of clarity: yes, B had committed the deletion.

> If so, when developer A runs 'svn up', the locally edited file won't be
> deleted; it just becomes unversioned. Temporarily move the unversioned
> file aside. Ressurrect the original file (see chapter 4), then copy the
> unversioned file back on top of the resurrected file, so it looks like
> you made the new edits. Then commit.

Worked a treat. Thank you. Particular as I was playing the role of
'B'.

-- 
Giles
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org