私は同じ問題を抱えていましたが、解決するのは非常に簡単であることがわかりました(私の場合)。コンソールを開き、問題が発生しているフォルダーに移動します (この場合は<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
それで全部です。希望は誰かに役立つかもしれません。