我的工作副本处于不一致状态:
$ svn status
svn: E155037: Previous operation has not finished; run 'cleanup' if it was interrupted
$ svn cleanup
svn: E155010: The node '<myprojectpath>/libs/armeabi/gdbserver' was not found.
Run Code Online (Sandbox Code Playgroud)
我被困在上面了.有解决方案可以解决这个问题吗?谢谢.
小智 19
我有同样的问题,我发现这很简单(在我的例子中).打开控制台并转到显示问题的文件夹(在您的情况下<myprojectpath>/libs/armeabi/gdbserver).
跑svn up.它会显示一行显示相同的错误svn: E155010:....
lore@loreLaptop ~/workspace/Ng
$ svn up
Updating '.':
svn: E155010: The node '/home/lore/workspace/Ng/.classpath' was not found.
Run Code Online (Sandbox Code Playgroud)
跑svn cleanup.
lore@loreLaptop ~/workspace/Ng
$ svn cleanup
Run Code Online (Sandbox Code Playgroud)
svn up再次运行:将显示一个菜单,允许您编辑/解析/接受/ ...特定配置:
lore@loreLaptop ~/workspace/Ng
$ svn up
Updating '.':
Conflict for property 'svn:ignore' discovered on '/home/lore/workspace/Ng'.
Select: (p) postpone, (df) diff-full, (e) edit,
(s) show all options: s
(e) edit - change merged file in an editor
(df) diff-full - show all changes made to merged file
(r) resolved - accept merged version of file
(dc) display-conflict - show all conflicts (ignoring merged version)
(mc) mine-conflict - accept my version for all conflicts (same)
(tc) theirs-conflict - accept their version for all conflicts (same)
(mf) mine-full - accept my version of entire file (even non-conflicts)
(tf) theirs-full - accept their version of entire file (same)
(p) postpone - mark the conflict to be resolved later
(l) launch - launch external tool to resolve conflict
(s) show all - show this list
Select: (p) postpone, (df) diff-full, (e) edit,
(s) show all options: e
Select: (p) postpone, (df) diff-full, (e) edit, (r) resolved,
(s) show all options: r
U .
Updated to revision 193.
Summary of conflicts:
Skipped paths: 2
Run Code Online (Sandbox Code Playgroud)
运行svn up以确保冲突已解决:
lore@loreLaptop ~/workspace/Ng
$ svn up
Updating '.':
At revision 193.
Summary of conflicts:
Skipped paths: 2
Run Code Online (Sandbox Code Playgroud)
就这样.希望对某人有用.
svn 1.7:在尝试向SVN添加不属于我的目录树之后,我发生了这种情况.它失败了并且遇到了同样的OP错误.
结果是sqlite SVN文件的表work_queue中有一些条目,SVN无法处理,无论是因为权限还是因为我之后删除了文件.
我解决了它:
> sqlite3 .svn/wc.db
SQLite version 3.6.20
Enter ".help" for instructions
Enter SQL statements terminated with a ";"
sqlite> delete from work_queue;
sqlite> .quit
> svn cleanup
Run Code Online (Sandbox Code Playgroud)
然后递归还原,一切都很好.
| 归档时间: |
|
| 查看次数: |
49167 次 |
| 最近记录: |