发表新帖
发表新帖

What should I do when 'svn cleanup' fails?

后端 未结
关注
30 1489
谎友^
谎友^ 2020-12-04 04:50

I have a lot of changes in a working folder, and something screwed up trying to do an update.

Now when I issue an \'svn cleanup\' I get:

>svn clea
相关标签:
30条回答
  • 抹茶落季
    2020-12-04 05:07

    I just had this same problem on Windows 7 64-bit. I ran console as administrator and deleted the .svn directory from the problem directory (got an error about logs or something, but ignored it). Then, in explorer, I deleted the problem directory which was no longer showing as under version control. Then, I ran an update and things proceeded as expected.

    0 讨论(0)
  • 时光说笑
    2020-12-04 05:09

    When starting all over is not an option...

    I deleted the log file in the .svn directory (I also deleted the offending file in .svn/props-base), did a cleanup, and resumed my update.

    0 讨论(0)
  • 野趣味
    2020-12-04 05:10

    I hit an issue where following an Update, SVN showed a folder as being conflicted. Strangely, this was only visible through the command line - TortoiseSVN thought it was all fine.

    #>svn st
!       my_dir
!       my_dir\sub_dir

    svn cleanup, svn revert, svn update and svn resolve were all unsuccessful at fixing this.

    I eventually solved the problem as follows:

    • Look in the .svn directory for "sub_dir"
    • Use RC -> Properties to uncheck the 'read only' flag on the entries file
    • Open the entries file and delete the line "unfinished ..." and the corresponding checksum
    • Save, and re-enable the read-only flag
    • Repeat for the my_dir directory

    Following that, everything was fine.

    Note I didn't have any local changes, so I don't know if you'd be at risk if you did. I didn't use the delete / update method suggested by others - I got into this state by trying that on the my_dir/sub_dir/sub_sub_dir directory (which started with the same symptoms) - so I didn't want to risk making things worse again!

    Not quite on-topic, but maybe helpful if someone comes across this post as I did.

    0 讨论(0)
  • 春和景丽
    2020-12-04 05:10

    While facing a similar issue, manual merge in the repository sync view helped to solve the issue.

    One file name was conflicting with other and it clearly mentioned the issue. Renaming the newer file to a different name resolved it.

    0 讨论(0)
  • 迷失自我
    2020-12-04 05:11

    Answers here didn't help me, but before checking out the project again, I closed and opened Eclipse (Subversive is my SVN client) and the problem disappeared.

    0 讨论(0)
  • 别那么骄傲
    2020-12-04 05:12

    Take a look at

    http://www.anujvarma.com/svn-cleanup-failedprevious-operation-has-not-finished-run-cleanup-if-it-was-interrupted/

    Summary of fix from above link (Thanks to Anuj Varma)

    1. Install sqlite command-line shell (sqlite-tools-win32) from http://www.sqlite.org/download.html

    2. sqlite3 .svn/wc.db "select * from work_queue"

    The SELECT should show you your offending folder/file as part of the work queue. What you need to do is delete this item from the work queue.

    1. sqlite3 .svn/wc.db "delete from work_queue"

    That’s it. Now, you can run cleanup again – and it should work. Or you can proceed directly to the task you were doing before being prompted to run cleanup (adding a new file etc.)

    0 讨论(0)
 看不清?
提交回复
热议问题