SVN樹錯誤

Question

我是SVN的新手，我認為我犯了一些錯誤，不確定如何解決。 我正在將插件上傳到WordPress。 我上傳了幾個版本，然后意識到我正在開發的一個文件尚未准備就緒並引起了問題。 因此，我從Trunk文件夾和標簽版本文件夾中刪除了文件，現在出現以下錯誤。 似乎無論我做什么我都無法修復它。

當我執行svn stat時，我得到：

?       bh-design
!     C tags/1.0/widgets/email-subscription
      >   local delete, incoming delete upon update
!     C tags/1.1/widgets/email-subscription
      >   local delete, incoming delete upon update
?       tags/1.2
!       tags/1.4
!       tags/1.4/assets
!M      tags/1.4/assets/screenshot-1.png
!M      tags/1.4/assets/screenshot-2.png
!M      tags/1.4/assets/screenshot-3.png
!M      tags/1.4/bhdesign-font-demo.html
!       tags/1.4/bhdesign-plugin.css
!       tags/1.4/bhdesign-plugin.php
!       tags/1.4/css
!       tags/1.4/css/bh-login.css
!M      tags/1.4/css/featherlight.min.css
!       tags/1.4/fonts
!M      tags/1.4/fonts/Read Me.txt
!       tags/1.4/fonts/demo-files
!M      tags/1.4/fonts/demo-files/demo.css
!M      tags/1.4/fonts/demo-files/demo.js
!M      tags/1.4/fonts/icomoon.eot
!M      tags/1.4/fonts/icomoon.svg
!M      tags/1.4/fonts/icomoon.ttf
!M      tags/1.4/fonts/icomoon.woff
!M      tags/1.4/fonts/selection.json
!M      tags/1.4/fonts/style.css
!       tags/1.4/images
!M      tags/1.4/images/bh-help.jpg
!M      tags/1.4/images/bh-icon.png
!M      tags/1.4/images/bh-login-logo.png
!M      tags/1.4/images/bh-video-add-image.png
!M      tags/1.4/images/bh-video-add-widget.png
!M      tags/1.4/images/bh-video-categories-tags.png
!M      tags/1.4/images/bh-video-comment-spam.png
!M      tags/1.4/images/bh-video-create-link.png
!M      tags/1.4/images/bh-video-create-page.png
!M      tags/1.4/images/bh-video-create-post.png
!M      tags/1.4/images/bh-video-custom-menu.png
!M      tags/1.4/images/bh-video-dashboard-login.png
!M      tags/1.4/images/bh-video-dashboard-overview.png
!M      tags/1.4/images/bh-video-disable-trackbacks.png
!M      tags/1.4/images/bh-video-distraction-free.png
!M      tags/1.4/images/bh-video-edit-post.png
!M      tags/1.4/images/bh-video-embed-video.png
!M      tags/1.4/images/bh-video-lovation-currency-measurements.png
!M      tags/1.4/images/bh-video-manage-orders.png
!M      tags/1.4/images/bh-video-media.png
!M      tags/1.4/images/bh-video-product-variations.png
!M      tags/1.4/images/bh-video-settings-overview.png
!M      tags/1.4/images/bh-video-shipping-methods.png
!M      tags/1.4/images/bh-video-user.png
!M      tags/1.4/images/bh-video-woocommerce-products.png
!M      tags/1.4/images/bluehost-info-sheet.jpg
!M      tags/1.4/images/help-thumb-template.psd
!M      tags/1.4/images/hm-help.jpg
!M      tags/1.4/images/hm-icon.png
!M      tags/1.4/images/hm-login-logo.png
!M      tags/1.4/images/hm-video-add-image.png
!M      tags/1.4/images/hm-video-add-widget.png
!M      tags/1.4/images/hm-video-categories-tags.png
!M      tags/1.4/images/hm-video-comment-spam.png
!M      tags/1.4/images/hm-video-create-link.png
!M      tags/1.4/images/hm-video-create-page.png
!M      tags/1.4/images/hm-video-create-post.png
!M      tags/1.4/images/hm-video-custom-menu.png
!M      tags/1.4/images/hm-video-dashboard-login.png
!M      tags/1.4/images/hm-video-dashboard-overview.png
!M      tags/1.4/images/hm-video-disable-trackbacks.png
!M      tags/1.4/images/hm-video-distraction-free.png
!M      tags/1.4/images/hm-video-edit-post.png
!M      tags/1.4/images/hm-video-embed-video.png
!M      tags/1.4/images/hm-video-lovation-currency-measurements.png
!M      tags/1.4/images/hm-video-manage-orders.png
!M      tags/1.4/images/hm-video-media.png
!M      tags/1.4/images/hm-video-product-variations.png
!M      tags/1.4/images/hm-video-settings-overview.png
!M      tags/1.4/images/hm-video-shipping-methods.png
!M      tags/1.4/images/hm-video-user.png
!M      tags/1.4/images/hm-video-woocommerce-products.png
!M      tags/1.4/images/jh-help.jpg
!M      tags/1.4/images/jh-icon.png
!M      tags/1.4/images/jh-login-logo.png
!M      tags/1.4/images/jh-video-add-image.png
!M      tags/1.4/images/jh-video-add-widget.png
!M      tags/1.4/images/jh-video-categories-tags.png
!M      tags/1.4/images/jh-video-comment-spam.png
!M      tags/1.4/images/jh-video-create-link.png
!M      tags/1.4/images/jh-video-create-page.png
!M      tags/1.4/images/jh-video-create-post.png
!M      tags/1.4/images/jh-video-custom-menu.png
!M      tags/1.4/images/jh-video-dashboard-login.png
!M      tags/1.4/images/jh-video-dashboard-overview.png
!M      tags/1.4/images/jh-video-disable-trackbacks.png
!M      tags/1.4/images/jh-video-distraction-free.png
!M      tags/1.4/images/jh-video-edit-post.png
!M      tags/1.4/images/jh-video-embed-video.png
!M      tags/1.4/images/jh-video-lovation-currency-measurements.png
!M      tags/1.4/images/jh-video-manage-orders.png
!M      tags/1.4/images/jh-video-media.png
!M      tags/1.4/images/jh-video-product-variations.png
!M      tags/1.4/images/jh-video-settings-overview.png
!M      tags/1.4/images/jh-video-shipping-methods.png
!M      tags/1.4/images/jh-video-user.png
!M      tags/1.4/images/jh-video-woocommerce-products.png
!       tags/1.4/includes
!       tags/1.4/includes/login-screen.php
!       tags/1.4/includes/options-page-wrapper.php
!       tags/1.4/js
!M      tags/1.4/js/featherlight.min.js
!       tags/1.4/readme.txt
!       tags/1.4/widgets
!       tags/1.4/widgets/social-icons
!       tags/1.4/widgets/social-icons/inc
!       tags/1.4/widgets/social-icons/inc/options.php
!       tags/1.4/widgets/social-icons/inc/output.php
!       tags/1.4/widgets/social-icons/social-icons.php
!       tags/1.4/widgets/social-icons/style.css
M       trunk/bhdesign-plugin.php
M       trunk/readme.txt
?     C trunk/widgets/email-subscription
      >   local delete, incoming delete upon update
Summary of conflicts:
  Tree conflicts: 3

當我嘗試通過svn ci -m'notes'提交插件時，我得到：

?       bh-design
!     C tags/1.0/widgets/email-subscription
      >   local delete, incoming delete upon update
!     C tags/1.1/widgets/email-subscription
      >   local delete, incoming delete upon update
?       tags/1.2
!       tags/1.4
!       tags/1.4/assets
!M      tags/1.4/assets/screenshot-1.png
!M      tags/1.4/assets/screenshot-2.png
!M      tags/1.4/assets/screenshot-3.png
!M      tags/1.4/bhdesign-font-demo.html
!       tags/1.4/bhdesign-plugin.css
!       tags/1.4/bhdesign-plugin.php
!       tags/1.4/css
!       tags/1.4/css/bh-login.css
!M      tags/1.4/css/featherlight.min.css
!       tags/1.4/fonts
!M      tags/1.4/fonts/Read Me.txt
!       tags/1.4/fonts/demo-files
!M      tags/1.4/fonts/demo-files/demo.css
!M      tags/1.4/fonts/demo-files/demo.js
!M      tags/1.4/fonts/icomoon.eot
!M      tags/1.4/fonts/icomoon.svg
!M      tags/1.4/fonts/icomoon.ttf
!M      tags/1.4/fonts/icomoon.woff
!M      tags/1.4/fonts/selection.json
!M      tags/1.4/fonts/style.css
!       tags/1.4/images
!M      tags/1.4/images/bh-help.jpg
!M      tags/1.4/images/bh-icon.png
!M      tags/1.4/images/bh-login-logo.png
!M      tags/1.4/images/bh-video-add-image.png
!M      tags/1.4/images/bh-video-add-widget.png
!M      tags/1.4/images/bh-video-categories-tags.png
!M      tags/1.4/images/bh-video-comment-spam.png
!M      tags/1.4/images/bh-video-create-link.png
!M      tags/1.4/images/bh-video-create-page.png
!M      tags/1.4/images/bh-video-create-post.png
!M      tags/1.4/images/bh-video-custom-menu.png
!M      tags/1.4/images/bh-video-dashboard-login.png
!M      tags/1.4/images/bh-video-dashboard-overview.png
!M      tags/1.4/images/bh-video-disable-trackbacks.png
!M      tags/1.4/images/bh-video-distraction-free.png
!M      tags/1.4/images/bh-video-edit-post.png
!M      tags/1.4/images/bh-video-embed-video.png
!M      tags/1.4/images/bh-video-lovation-currency-measurements.png
!M      tags/1.4/images/bh-video-manage-orders.png
!M      tags/1.4/images/bh-video-media.png
!M      tags/1.4/images/bh-video-product-variations.png
!M      tags/1.4/images/bh-video-settings-overview.png
!M      tags/1.4/images/bh-video-shipping-methods.png
!M      tags/1.4/images/bh-video-user.png
!M      tags/1.4/images/bh-video-woocommerce-products.png
!M      tags/1.4/images/bluehost-info-sheet.jpg
!M      tags/1.4/images/help-thumb-template.psd
!M      tags/1.4/images/hm-help.jpg
!M      tags/1.4/images/hm-icon.png
!M      tags/1.4/images/hm-login-logo.png
!M      tags/1.4/images/hm-video-add-image.png
!M      tags/1.4/images/hm-video-add-widget.png
!M      tags/1.4/images/hm-video-categories-tags.png
!M      tags/1.4/images/hm-video-comment-spam.png
!M      tags/1.4/images/hm-video-create-link.png
!M      tags/1.4/images/hm-video-create-page.png
!M      tags/1.4/images/hm-video-create-post.png
!M      tags/1.4/images/hm-video-custom-menu.png
!M      tags/1.4/images/hm-video-dashboard-login.png
!M      tags/1.4/images/hm-video-dashboard-overview.png
!M      tags/1.4/images/hm-video-disable-trackbacks.png
!M      tags/1.4/images/hm-video-distraction-free.png
!M      tags/1.4/images/hm-video-edit-post.png
!M      tags/1.4/images/hm-video-embed-video.png
!M      tags/1.4/images/hm-video-lovation-currency-measurements.png
!M      tags/1.4/images/hm-video-manage-orders.png
!M      tags/1.4/images/hm-video-media.png
!M      tags/1.4/images/hm-video-product-variations.png
!M      tags/1.4/images/hm-video-settings-overview.png
!M      tags/1.4/images/hm-video-shipping-methods.png
!M      tags/1.4/images/hm-video-user.png
!M      tags/1.4/images/hm-video-woocommerce-products.png
!M      tags/1.4/images/jh-help.jpg
!M      tags/1.4/images/jh-icon.png
!M      tags/1.4/images/jh-login-logo.png
!M      tags/1.4/images/jh-video-add-image.png
!M      tags/1.4/images/jh-video-add-widget.png
!M      tags/1.4/images/jh-video-categories-tags.png
!M      tags/1.4/images/jh-video-comment-spam.png
!M      tags/1.4/images/jh-video-create-link.png
!M      tags/1.4/images/jh-video-create-page.png
!M      tags/1.4/images/jh-video-create-post.png
!M      tags/1.4/images/jh-video-custom-menu.png
!M      tags/1.4/images/jh-video-dashboard-login.png
!M      tags/1.4/images/jh-video-dashboard-overview.png
!M      tags/1.4/images/jh-video-disable-trackbacks.png
!M      tags/1.4/images/jh-video-distraction-free.png
!M      tags/1.4/images/jh-video-edit-post.png
!M      tags/1.4/images/jh-video-embed-video.png
!M      tags/1.4/images/jh-video-lovation-currency-measurements.png
!M      tags/1.4/images/jh-video-manage-orders.png
!M      tags/1.4/images/jh-video-media.png
!M      tags/1.4/images/jh-video-product-variations.png
!M      tags/1.4/images/jh-video-settings-overview.png
!M      tags/1.4/images/jh-video-shipping-methods.png
!M      tags/1.4/images/jh-video-user.png
!M      tags/1.4/images/jh-video-woocommerce-products.png
!       tags/1.4/includes
!       tags/1.4/includes/login-screen.php
!       tags/1.4/includes/options-page-wrapper.php
!       tags/1.4/js
!M      tags/1.4/js/featherlight.min.js
!       tags/1.4/readme.txt
!       tags/1.4/widgets
!       tags/1.4/widgets/social-icons
!       tags/1.4/widgets/social-icons/inc
!       tags/1.4/widgets/social-icons/inc/options.php
!       tags/1.4/widgets/social-icons/inc/output.php
!       tags/1.4/widgets/social-icons/social-icons.php
!       tags/1.4/widgets/social-icons/style.css
M       trunk/bhdesign-plugin.php
M       trunk/readme.txt
?     C trunk/widgets/email-subscription
      >   local delete, incoming delete upon update
Summary of conflicts:
  Tree conflicts: 3
10-200-8-78:bh-design brturpin$ svn stat
?       bh-design
!     C tags/1.0/widgets/email-subscription
      >   local delete, incoming delete upon update
!     C tags/1.1/widgets/email-subscription
      >   local delete, incoming delete upon update
?       tags/1.2
!       tags/1.4
!       tags/1.4/assets
!M      tags/1.4/assets/screenshot-1.png
!M      tags/1.4/assets/screenshot-2.png
!M      tags/1.4/assets/screenshot-3.png
!M      tags/1.4/bhdesign-font-demo.html
!       tags/1.4/bhdesign-plugin.css
!       tags/1.4/bhdesign-plugin.php
!       tags/1.4/css
!       tags/1.4/css/bh-login.css
!M      tags/1.4/css/featherlight.min.css
!       tags/1.4/fonts
!M      tags/1.4/fonts/Read Me.txt
!       tags/1.4/fonts/demo-files
!M      tags/1.4/fonts/demo-files/demo.css
!M      tags/1.4/fonts/demo-files/demo.js
!M      tags/1.4/fonts/icomoon.eot
!M      tags/1.4/fonts/icomoon.svg
!M      tags/1.4/fonts/icomoon.ttf
!M      tags/1.4/fonts/icomoon.woff
!M      tags/1.4/fonts/selection.json
!M      tags/1.4/fonts/style.css
!       tags/1.4/images
!M      tags/1.4/images/bh-help.jpg
!M      tags/1.4/images/bh-icon.png
!M      tags/1.4/images/bh-login-logo.png
!M      tags/1.4/images/bh-video-add-image.png
!M      tags/1.4/images/bh-video-add-widget.png
!M      tags/1.4/images/bh-video-categories-tags.png
!M      tags/1.4/images/bh-video-comment-spam.png
!M      tags/1.4/images/bh-video-create-link.png
!M      tags/1.4/images/bh-video-create-page.png
!M      tags/1.4/images/bh-video-create-post.png
!M      tags/1.4/images/bh-video-custom-menu.png
!M      tags/1.4/images/bh-video-dashboard-login.png
!M      tags/1.4/images/bh-video-dashboard-overview.png
!M      tags/1.4/images/bh-video-disable-trackbacks.png
!M      tags/1.4/images/bh-video-distraction-free.png
!M      tags/1.4/images/bh-video-edit-post.png
!M      tags/1.4/images/bh-video-embed-video.png
!M      tags/1.4/images/bh-video-lovation-currency-measurements.png
!M      tags/1.4/images/bh-video-manage-orders.png
!M      tags/1.4/images/bh-video-media.png
!M      tags/1.4/images/bh-video-product-variations.png
!M      tags/1.4/images/bh-video-settings-overview.png
!M      tags/1.4/images/bh-video-shipping-methods.png
!M      tags/1.4/images/bh-video-user.png
!M      tags/1.4/images/bh-video-woocommerce-products.png
!M      tags/1.4/images/bluehost-info-sheet.jpg
!M      tags/1.4/images/help-thumb-template.psd
!M      tags/1.4/images/hm-help.jpg
!M      tags/1.4/images/hm-icon.png
!M      tags/1.4/images/hm-login-logo.png
!M      tags/1.4/images/hm-video-add-image.png
!M      tags/1.4/images/hm-video-add-widget.png
!M      tags/1.4/images/hm-video-categories-tags.png
!M      tags/1.4/images/hm-video-comment-spam.png
!M      tags/1.4/images/hm-video-create-link.png
!M      tags/1.4/images/hm-video-create-page.png
!M      tags/1.4/images/hm-video-create-post.png
!M      tags/1.4/images/hm-video-custom-menu.png
!M      tags/1.4/images/hm-video-dashboard-login.png
!M      tags/1.4/images/hm-video-dashboard-overview.png
!M      tags/1.4/images/hm-video-disable-trackbacks.png
!M      tags/1.4/images/hm-video-distraction-free.png
!M      tags/1.4/images/hm-video-edit-post.png
!M      tags/1.4/images/hm-video-embed-video.png
!M      tags/1.4/images/hm-video-lovation-currency-measurements.png
!M      tags/1.4/images/hm-video-manage-orders.png
!M      tags/1.4/images/hm-video-media.png
!M      tags/1.4/images/hm-video-product-variations.png
!M      tags/1.4/images/hm-video-settings-overview.png
!M      tags/1.4/images/hm-video-shipping-methods.png
!M      tags/1.4/images/hm-video-user.png
!M      tags/1.4/images/hm-video-woocommerce-products.png
!M      tags/1.4/images/jh-help.jpg
!M      tags/1.4/images/jh-icon.png
!M      tags/1.4/images/jh-login-logo.png
!M      tags/1.4/images/jh-video-add-image.png
!M      tags/1.4/images/jh-video-add-widget.png
!M      tags/1.4/images/jh-video-categories-tags.png
!M      tags/1.4/images/jh-video-comment-spam.png
!M      tags/1.4/images/jh-video-create-link.png
!M      tags/1.4/images/jh-video-create-page.png
!M      tags/1.4/images/jh-video-create-post.png
!M      tags/1.4/images/jh-video-custom-menu.png
!M      tags/1.4/images/jh-video-dashboard-login.png
!M      tags/1.4/images/jh-video-dashboard-overview.png
!M      tags/1.4/images/jh-video-disable-trackbacks.png
!M      tags/1.4/images/jh-video-distraction-free.png
!M      tags/1.4/images/jh-video-edit-post.png
!M      tags/1.4/images/jh-video-embed-video.png
!M      tags/1.4/images/jh-video-lovation-currency-measurements.png
!M      tags/1.4/images/jh-video-manage-orders.png
!M      tags/1.4/images/jh-video-media.png
!M      tags/1.4/images/jh-video-product-variations.png
!M      tags/1.4/images/jh-video-settings-overview.png
!M      tags/1.4/images/jh-video-shipping-methods.png
!M      tags/1.4/images/jh-video-user.png
!M      tags/1.4/images/jh-video-woocommerce-products.png
!       tags/1.4/includes
!       tags/1.4/includes/login-screen.php
!       tags/1.4/includes/options-page-wrapper.php
!       tags/1.4/js
!M      tags/1.4/js/featherlight.min.js
!       tags/1.4/readme.txt
!       tags/1.4/widgets
!       tags/1.4/widgets/social-icons
!       tags/1.4/widgets/social-icons/inc
!       tags/1.4/widgets/social-icons/inc/options.php
!       tags/1.4/widgets/social-icons/inc/output.php
!       tags/1.4/widgets/social-icons/social-icons.php
!       tags/1.4/widgets/social-icons/style.css
M       trunk/bhdesign-plugin.php
M       trunk/readme.txt
?     C trunk/widgets/email-subscription
      >   local delete, incoming delete upon update
Summary of conflicts:
  Tree conflicts: 3
10-200-8-78:bh-design brturpin$ svn ci -m 'Version 1.2'
svn: E155015: Commit failed (details follow):
svn: E155015: Aborting commit: '/Users/brturpin/Sites/wordpress-org/bh-design/tags/1.0/widgets/email-subscription' remains in conflict

您可以在此處查看現在的內容： http : //plugins.svn.wordpress.org/bh-design/tags/

關於tag / 1.4 / *和我刪除的電子郵件訂閱文件夾，存在很多錯誤。 問題是我的本地計算機上沒有標簽/1.4/，並且在執行svn時不會添加它，因此我不確定此1.4的位置。

任何幫助都會很好！

Answer 1

我最終不得不從SVN中刪除所有內容，然后從頭開始。