我正在使用subversion,因此我可以有两个签出,一个用于测试以确保工作正常,另一个用于公共实时站点。 我在测试网站上做了一些更改,但也对wordpress安装进行了一些更新。 现在我无法在我的实际网站上提交更改。
[phil@sessions public_html]$ svn commit -m "this time, it's personal" svn: Commit failed (details follow): svn: Working copy '/usr/local/apache/sites/nextadvisor_admin/blog/wp-content/plugins' is missing or not locked所以我...
[phil@sessions public_html]$svn rm blog/wp-content/plugins --force [phil@sessions public_html]$svn rm blog/wp-content/plugins --force [phil@sessions public_html]$svn add blog/wp-content/plugins --force并且所有文件都重新添加,然后我
[phil@sessions public_html]$ svn commit -m "this time really" Sending blog/.htaccess Replacing blog/wp-content svn: Commit failed (details follow): svn: Out of date: '/trunk/blog/wp-content/plugins' in transaction '186-1'好的,所以当我在网上看它告诉我做svn更新,但我曾尝试过一次,它只是删除了我所有的本地更改,因为我的测试结帐中不存在“blog /”文件夹。
我的问题是,如何在不丢失本地编辑的情况下使此提交工作?
更新:
当我运行svnupdate时,它告诉我:
svn:存储库中不存在工作副本路径'blog / wp-content / plugins'
I'm using subversion so that I can have two checkouts, one for testing to make sure things work and another which is public live site. I made some changes in the test site but also made some updates to a wordpress install. Now I can't commit the changes on my live site.
[phil@sessions public_html]$ svn commit -m "this time, it's personal" svn: Commit failed (details follow): svn: Working copy '/usr/local/apache/sites/nextadvisor_admin/blog/wp-content/plugins' is missing or not lockedso I...
[phil@sessions public_html]$svn rm blog/wp-content/plugins --force [phil@sessions public_html]$svn rm blog/wp-content/plugins --force [phil@sessions public_html]$svn add blog/wp-content/plugins --forceand all the files got re-added, then I
[phil@sessions public_html]$ svn commit -m "this time really" Sending blog/.htaccess Replacing blog/wp-content svn: Commit failed (details follow): svn: Out of date: '/trunk/blog/wp-content/plugins' in transaction '186-1'Okay so when I look online it tells me to do svn update but I tried that once before and it just erases all my local changes because the "blog/" folder doesn't exist in my test checkout.
My question is, how can I make this commit work without losing the local edits?
Update:
When I run svnupdate, it tells me:
svn: Working copy path 'blog/wp-content/plugins' does not exist in repository
最满意答案
将本地修改的文件保存为副本。
执行svn update
通过' svn update d'版本复制已更改的文件
做提交。
Save your locally modified files to a copy.
perform an svn update
Copy your changed files back over the 'svn updated' versions
do the commit.
更多推荐
发布评论