subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Niemann, Hartmut" <>
Subject AW: E155011 + E160013: how to clear this mess?
Date Thu, 14 Feb 2019 15:16:41 GMT
Hello Stefan,

> On Thu, Feb 14, 2019 at 12:55:02PM +0000, Niemann, Hartmut wrote:
> > Hello!
> > 
> > After some copying of trees, and renaming I seem to have brought my WC into a messy
> > 
> > when I try to commit changes of a folder, I get
> > 
> > Deleting       #REQ#B4#1#.xlsx
> > svn: E155011: Commit failed (details follow):
> > svn: E155011: File 'D:\localpath...\#REQ#B4#1#.xlsx' is out of date
> > svn: E160013: 
> > '/repos/locoproc/!svn/txr/15246-c5h/remotepath.../%23REQ%23B4%231%23.x
> > lsx' path not found
> > 
> > If I look into the 'repo browser', the file that is marked as "delete" isn't there.
> > So SVN wants to commit a delete for a file that is not committed.
> > revert doesn't help.
> But reverting the local deletion should indeed be possible and prevent 'svn commit' from
trying to delete this path.
> So why does revert not help? How did you attempt to revert the deleted path? What output
did you see when you tried to revert the path? 

you gave me the right hint, thanks a lot.

I reverted, and had the file recreated.

But, which is odd: the file had never been committed. TortoiseSVN's repo browser did not show
(it did only show one other file that was supposed to be there).
So I had a file marked as "in sync with the repo" that wasn't in the repository.
(IIRC I had tried that before: revert, see it, try to delete it, get the message from above).

This time I ran "update to revision -- empty" on that directory, removing all files,
and then back to "update to revision -- all elements fully recursive" and the file that belongs
there was restored 
and the one that I had wanted to delete is gone finally.

So an svn update with --set-depth empty seems to clean up the working copy database in this

I am happy again :-)

Mit freundlichen Grüßen
Dr. Hartmut Niemann

Siemens Mobility GmbH
Werner-von-Siemens-Str. 67
91052 Erlangen, Deutschland
Tel.: +49 9131 17-50518
Mobil: +49 173 5342327


View raw message