eclipse 重新打包后Eclipse SVN提交错误
声明：本页面是StackOverFlow热门问题的中英对照翻译，遵循CC BY-SA 4.0协议，如果您需要使用它，必须同样遵循CC BY-SA许可，注明原文地址和作者信息，同时你必须将它归于原作者（不是我）：StackOverFlow
原文地址: http://stackoverflow.com/questions/8006629/
Warning: these are provided under cc-by-sa 4.0 license. You are free to use/share it, But you must attribute it to the original authors (not me):
StackOverFlow
Eclipse SVN Commit error after repackage
提问by Karl
Via Eclipse, I have repackaged my Android app. I wanted to commit my change, but I get SVN Commit has encountered a problem. Directory xyz is out of date. xyz is the old package name. This package shows up in Eclipse with a 2x2 box icon, with an x in the lower right corner. Any suggestions how I can fix this so my commit works and I eliminate the old package?
通过 Eclipse，我重新打包了我的 Android 应用程序。我想提交我的更改，但我得到 SVN Commit 遇到了问题。目录 xyz 已过期。xyz 是旧的包名。这个包在 Eclipse 中显示为一个 2x2 的框图标，右下角有一个 x。有什么建议可以解决这个问题，以便我的提交工作并消除旧包？
回答by Peter Szanto
Do a Team / Updete to Head on your project
做一个团队/更新来领导你的项目
回答by Rodrigo Leit?o
I know this question is kinda old and I won′t give you a solution but...
我知道这个问题有点老了，我不会给你解决方案，但是......
I use to have this problem too (and other with svn in eclipse), usually it occurs when SVN needs to delete a folder and it parents (or a bigger tree then 2 folder).
我曾经也遇到过这个问题（以及其他在 Eclipse 中使用 svn 的问题），通常发生在 SVN 需要删除一个文件夹及其父文件夹（或更大的树然后是 2 个文件夹）时。
Usually I just commit all I have to commit, and after it starts to encountering a problem with "out of date" I delete all the old folder tree directly on SVN. To do that I use the view "SVN Repositories". Then just do a full update at your project.
通常我只提交我必须提交的所有内容，在它开始遇到“过时”问题后，我直接在 SVN 上删除所有旧文件夹树。为此，我使用视图“SVN 存储库”。然后只需对您的项目进行全面更新。
If you just do the update without perform the manual deletion of older folder, you′ll need update for each "leaf folder" you need to delete.
如果您只是在没有手动删除旧文件夹的情况下进行更新，则您需要对每个需要删除的“叶文件夹”进行更新。
It doesn′t solve your (or mine) problem, but at least make this folder deletion faster...
它不能解决您（或我的）问题，但至少可以更快地删除此文件夹...
回答by ganime
I did an combination of the accepted answer and the second answer.
我结合了接受的答案和第二个答案。
- Delete the offending folder from svn by typing this at the command prompt: svn delete svn+ssh://[path to offending folder]" --message "Commit message"
- The first step will leave Eclipse SVN plugin thinking the by-hand-deleted folder needs to be synced. Do a Team-> Update to head
Even after Step 2, Eclipse detected a conflict : svn: E155015: Aborting commit: '[local path to the offending folder]' remains in conflict svn resolved [local path to the offending folder]
fixed the problem.
- 通过在命令提示符下键入以下内容，从 svn 中删除有问题的文件夹：svn delete svn+ssh://[path to offending folder]" --message "Commit message"
- 第一步会让 Eclipse SVN 插件认为手动删除的文件夹需要同步。做一个团队-> 更新到头
即使在第 2 步之后，Eclipse 仍检测到冲突：svn: E155015: Aborting commit: '[local path to the offending folder]' 仍然存在冲突 svnresolution [local path to the offending folder]
解决了这个问题。
Note: Step 1 uses the path at SVN, Step 3 needs the local path.
注意：步骤1使用SVN的路径，步骤3需要本地路径。
回答by Edison Agurto
Alternative Solution (Just in case the other top solutions don't works for you)
替代解决方案（以防万一其他顶级解决方案不适合您）
- Disconnect your project of SVN Repository. (rename disconnected project)
- Checkout the project again from SVN.
- Copy/Paste conflict folder or archives from disconnected project to new project donwloaded.
- Commit changes. Done!!
- 断开您的 SVN Repository 项目。（重命名断开连接的项目）
- 再次从 SVN 签出项目。
- 将冲突文件夹或档案从断开连接的项目复制/粘贴到下载的新项目。
- 提交更改。完毕！！
