svn - 如何解决 svn 错误 E155010？

Question

我的工作副本处于不一致状态:

$ 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.

我被困住了。有办法解决这个问题吗？谢谢。

Answer 1

我遇到了同样的问题，我发现解决起来非常简单(就我而言)。打开控制台并转到出现问题的文件夹(在您的例子中为 <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.

运行svn cleanup .

lore@loreLaptop ~/workspace/Ng
$ svn cleanup

运行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

运行svn up确保冲突得到解决:

lore@loreLaptop ~/workspace/Ng
$ svn up
Updating '.':
At revision 193.
Summary of conflicts:
  Skipped paths: 2

仅此而已。希望对某人有用。