转自:http://triopter.com/archive/resolving-local-delete-incoming-delete-upon-update-subversion-tree-conflicts/
NOTE: I’ve noticed a lot of traffic to this page for “local
edit incoming delete on update” errors, which are not what this article
is about (the solution below may or may not work for that — I have no
idea). This article is about “local delete
, incoming delete on
update” errors. Always back up your work before you muck around with
something like this, but that goes doubly if you’re going to try to use
these instructions for the “local edit” error.
For reason I’m still trying to untangle, I encountered some really
terrible conflicts this afternoon with an SVN checkin that didn’t
complete properly, leaving me with a few locked directories that
wouldn’t respond to “svn cleanup”.
Using these instructions
, I was able to get the
directories sorted out:
- Move offending directories out of working copy and to a safe place
(e.g. desktop)
- Run
svn cleanup
- Run
svn up
This actually restored the messed-up directories. Some files were
reverted and some deleted files restored; once the entire working copy
is cleaned up, you can use the backup copies of the directories to copy
back in your changes.
But before I could do that, I was left with a half-dozen individual
file conflicts with the following messages:
$ svn st
? C some_file.php
> local delete, incoming delete upon update
? C some_other_file.php
> local delete, incoming delete upon update
... etc.
Thankfully, these were files that I did
want to delete, so
even without instructions I wasn’t afraid to trial-and-error my way to
the following fix:
$ touch some_file.php some_other_file.php
$ svn revert some_file.php some_other_file.php
Once you’ve created the files, SVN can revert them, which leaves them
in unversioned status:
$ svn st
? some_file.php
? some_other_file.php
And then you can just delete them from the command line or whatever
file manager you use.
*Phew*
Once that was done I redid some deletions that had been overwritten
by the update that cleaned up the directories, and all was right in the
world.
Usual disclaimers, YMMV, etc.
分享到:
相关推荐
用来删除SVN文件用来删除SVN文件用来删除SVN文件用来删除SVN文件
批量删除svn 文件的 批处理文件,有效删除svn文件,快速删除!
python 实现svn的代码下载,解决了请求认证,字符编码,地址长度问题。非常不错的例子。
批量删除.svn文件夹、.svn文件使用svn进行版本控制,每个文件夹下都有.svn文件夹,有些项目在脱离svn版本控制之后,想删除项目中所有的.svn文件夹,可用下面的方法进行快速删除: 1、打开要删除.svn文件的最外层...
可以快速的清除所有的.SVN文件 可以快速的清除所有的.SVN文件
清除svn文件的小软件,只需将该批处理文件放在含有svn文件夹中,双击运行,即可删除不需要的svn文件。
加入到右键,直接删除.SVN文件,直接双击即可
clearSVN,轻松快速清楚svn文件
双击运行之后,自动修改注册表,为你的鼠标右键增加一个delete svn键,以后可通过该键删除被操作文件夹下的所有svn文件和文件夹
批量 删除SVN文件 安装后,右键就可以看到了
实现读取svn上的项目文件,并且返回文件的内容,可以很方便的做到实时浏览文件内容,亲测有效!
但最近由于需求变更,每次发布新版本要更新几十个,一个个太麻烦,所以就想用一个批处理文件,即BAT文件自动更新SVN文件,附件是从网上找到的,找了好久才找到,不是本人原他创,共大家分分享。
删除 .svn文件和文件夹 删除 .svn文件和文件夹
一个svn.bat批处理文件,直接拷贝到项目根目录下,双击执行,删除项目中所有的.svn文件
1.svn提交过程中出现错误的时候,可以使用这个文件进行对svn文件的删除 2. 需要双击运行,注册表 3.成功之后,文件夹右键可以看到 delete SVN Folders 祝大家使用顺利
windows下简单的删除.svn文件,快捷方便。 操作:双击改文件,成功添加到注册表中。再需要删除的文件右键点击该文件出现"Delete SVN Folders",单击成功删除。^_^
SVN_Deleter用于删除指定目录下的.svn目录。该工具采用PHP开发,可方便删除一些svn版本信息
自动抢svn文件锁定,对于svn文件,多人使用时,为了降低等待时间,浪费时间资源,自动锁定svn文件。
双击"删除该目录下面.svn文件.reg"即可在右键菜单中加入“删除该目录下面.svn文件”的菜单,在要清理的文件夹上右击选择“删除该目录下面.svn文件”即可完成清理,速度很快。
Windows下删除.svn文件夹的bat方法