On Mon, 2004-08-02 at 11:35, subversion@jujutsu.org.uk wrote:
> We've come across a problem here: I hope someone can help us out:
>
> Developer A has r 30 of a code base on his box.
> Developer A then modifies some files in his working copy
>
> Developer B deletes those files from subversion: svn remove foo.c
>
> Developer A then tries to commit his changes:
> svn status shows the file as modified (M)
> svn commit fails, reporting file not found.
>
> We've tried:
> svn update -r30 // last version with the file in
> svn commit
>
> &
> svn update
> svn commit
>
> Both of which fail with the same error.
>
> Is there a way of getting this modified file back into subversion
> without having to blow away its history and add it again?
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.
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.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Aug 2 21:32:33 2004