0

我使用了 eclipse juno 最新版本并从市场安装了 svn。到昨天为止,它运行良好。但从昨天晚上开始,它没有更新整个文件。只有一些文件更新了。

update /home/bellvantage/software/openerp-7/openerp/addons/bpl -r HEAD --force
    Restored /home/bellvantage/software/openerp-7/openerp/addons/bpl/__init__.py
    Restored /home/bellvantage/software/openerp-7/openerp/addons/bpl/__openerp__.py
    Restored /home/bellvantage/software/openerp-7/openerp/addons/bpl/bpl.py
    Restored /home/bellvantage/software/openerp-7/openerp/addons/bpl/bpl_estate_allowance.py
    Restored /home/bellvantage/software/openerp-7/openerp/addons/bpl/bpl_estate_deduction.py
    Restored /home/bellvantage/software/openerp-7/openerp/addons/bpl/bpl_individual_allowance.py
    Restored /home/bellvantage/software/openerp-7/openerp/addons/bpl/bpl_individual_deduction.py
    Restored /home/bellvantage/software/openerp-7/openerp/addons/bpl/bpl_master_allowance.py
    Restored /home/bellvantage/software/openerp-7/openerp/addons/bpl/bpl_master_deduction.py
    Restored /home/bellvantage/software/openerp-7/openerp/addons/bpl/bpl_view.xml
    Restored /home/bellvantage/software/openerp-7/openerp/addons/bpl/bpl_worker_registration_sequence.xml
    Restored /home/bellvantage/software/openerp-7/openerp/addons/bpl/company_view.xml
    Restored /home/bellvantage/software/openerp-7/openerp/addons/bpl/estate_allowance.xml
    Restored /home/bellvantage/software/openerp-7/openerp/addons/bpl/estate_deduction.xml
    Restored /home/bellvantage/software/openerp-7/openerp/addons/bpl/individual_allowance.xml
    Restored /home/bellvantage/software/openerp-7/openerp/addons/bpl/individual_deduction.xml
    Restored /home/bellvantage/software/openerp-7/openerp/addons/bpl/master_allowance.xml
    Restored /home/bellvantage/software/openerp-7/openerp/addons/bpl/master_deduction.xml
    Restored /home/bellvantage/software/openerp-7/openerp/addons/bpl/notes
    Restored /home/bellvantage/software/openerp-7/openerp/addons/bpl/security
    Restored /home/bellvantage/software/openerp-7/openerp/addons/bpl/security/bpl_security.xml
    Restored /home/bellvantage/software/openerp-7/openerp/addons/bpl/security/ir.model.access.csv
    U   /home/bellvantage/software/openerp-7/openerp/addons/bpl/bpl.py
    U   /home/bellvantage/software/openerp-7/openerp/addons/bpl/bpl_view.xml
    U   /home/bellvantage/software/openerp-7/openerp/addons/bpl/security/ir.model.access.csv
    Updated to revision 59070.
    ===== File Statistics: =====
    Updated: 3
revert -N /home/bellvantage/software/openerp-7/openerp/addons/bpl/static
revert -N /home/bellvantage/software/openerp-7/openerp/addons/bpl/static/src
revert -N /home/bellvantage/software/openerp-7/openerp/addons/bpl/static/src/css
revert -N /home/bellvantage/software/openerp-7/openerp/addons/bpl/static/src/css/bpl.css
revert -N /home/bellvantage/software/openerp-7/openerp/addons/bpl/static/src/img
revert -N /home/bellvantage/software/openerp-7/openerp/addons/bpl/static/src/img/icon.png
revert -N /home/bellvantage/software/openerp-7/openerp/addons/bpl/static/src/js
revert -N /home/bellvantage/software/openerp-7/openerp/addons/bpl/static/src/js/bpl_js.js
update  -r HEAD --force
    svn: E200009: Wrong number of targets has been specified (0), at least 1 is required.
    svn: E200009: Wrong number of targets has been specified (0), at least 1 is required.

请建议我解决这个问题

现在的问题就像来自 Eclipse 的 below.popup 对话框

Could not remove /home/bellvantage/software/openerp-7/openerp/addons/bpl/static/src/css/bpl.css
Could not remove /home/bellvantage/software/openerp-7/openerp/addons/bpl/static/src/css/bpl.css
4

2 回答 2

2

cd 到源文件所在的目录并尝试:

svn revert --recursive 。

(不要错过点)

于 2013-04-30T07:31:53.807 回答
1

我不确定它是否能解决您的问题,但有时 svn 不再与我的工作区“同步”。我通过刷新项目 (F5) 然后 Team/Cleanup 解决了这个问题。
之后,我可以重试阻塞的操作。

更新:如果您的所有提交都已完成,您可以尝试替换您的项目。如果您需要提交,请备份文件并尝试提交。如果它不起作用,请替换您的项目,然后从备份中复制您要提交的文件。您可能需要删除您的项目。

当您同步您的工作区时,如果您遵循以下顺序,您将避免出现问题:

  1. 解决你的冲突。
  2. 提交您的更改。
  3. 更新您的工作区。

如果您第一次更新工作区,有时 svn 会尝试解决冲突但失败并创建临时文件。在这种情况下,您需要使用团队/编辑冲突或团队/标记已解决来解决冲突,但它更复杂。

于 2013-04-30T08:37:17.070 回答