Re: can't commit delete of file that was in conflict, even after "svn resolved"

On May 20, 2007, at 22:52, cristan@123mail.org wrote:

> If I have a file in conflict, and instead of
> resolving the conflict I get fed up and decide to
> delete it altogether, I get this:
>
> > svn delete --force file
> D file
> > svn commit -m "" file
> svn: Commit failed (details follow):
> svn: Out of date: 'file' in transaction '24-1'
>
> Not even "svn resolved" helps.
>
> Is this intentional? The comment in delete_entry
> in subversion/libsvn_repos/commit.c seems to
> suggest not. Surely it was not intended to prevent
> the user from deleting a file if that's what he
> really really wants.

Perhaps your working copy is out of date? Have you already tried "svn
update"?

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue May 22 06:08:27 2007