We have some company middleware and sometimes its difficult to find the correct version Im looking for so I often have to update to different versions to test them.

I usually checkout:

svn co svn+ssh://(username)@(ip)/srv/svn/intranet/trunk/PYTHON/<application> <local-application>

I then may update to a different version

svn update (path) -r (rev)

Most of the time after a few attempts this will cause the error Node remains in conflict

If I delete the folder and try to do a fresh checkout it just restores what I had. All I want to do is checkout a revision, I have made no changes and it still thinks there are conflicts.

Ive tried to resolve them, but nothing seems to work:

svn update -r 1586

Skipped 'inm/inm' -- Node remains in conflict
D inm/fabfile.py
D inm/test.db.bak
D inm/tests
D inm/test.db
D inm/doc
D inm/test.ini
D inm/test.sql
U inm/setup.py
A inm/inm.egg-info
A inm/inm.egg-info/SOURCES.txt
A inm/inm.egg-info/top_level.txt
A inm/inm.egg-info/PKG-INFO
A inm/inm.egg-info/entry_points.txt
A inm/inm.egg-info/dependency_links.txt
A inm/inm.egg-info/not-zip-safe
A inm/inm.egg-info/paster_plugins.txt
A inm/inm.egg-info/requires.txt
U inm/setup.cfg
Updated to revision 1586.
Killed by signal 15.
Summary of conflicts:
Skipped paths: 1 svn resolved inm/inm
Resolved conflicted state of 'inm/inm'
(venv) svn update inm/inm -r 1586
Updating 'inm/inm':
Password:
Skipped 'inm/inm/templates' -- Node remains in conflict
At revision 1586.
Killed by signal 15.
Summary of conflicts:
Skipped paths: 1
asked Aug 2 '12 at 9:42
JackalopeZero
1,66031343
 
    
maybe untracked files cause the conflict; it's not very clear, what state/contents of that directory("path", is it the same as "intranet/trunk/PYTHON/<application>"?) you had before and after each operation; and what's your SVN version? –  Dmitry Pavlenko Aug 2 '12 at 9:59
    
If you think this is definitely a bug, write to users@subversion.apache.org or #svn channel at FreeNode – Dmitry Pavlenko Aug 2 '12 at 10:00
    
if you haven't update anything in the working copy, normally it won't behave like that. Just to make sure, are you updating the whole working copy to different rev, or just part of it? If it is the former case, it seems to me that's a bug in svn instead. –  Adrian Shum Aug 2 '12 at 10:02
    
Im using subversion-1.7.5-1.fc17.i686. It is the exact same path, Im literally just trying to get a new revision. Whatever I do it will not seem to just download the latest copy. Im trying to update the whole working copy.–  JackalopeZero Aug 2 '12 at 10:05 
1  
The second time it complains about another conflicting node. Maybe you should resolve the conflict with '--depth=infinity' option and something '--accept theirs' in order not to resolve every file manually. But anyway, strange.. Could you post the output of "svn status inm" before and after update? –  Dmitry Pavlenko Aug 2 '12 at 10:33

2 Answers

I think the answer I was looking for here was

svn revert --depth=infinity inm

I dont care about keeping local changes, only to update to a new revision. I have used this command a few times now and it seems to do the trick

EDIT

Upon looking at my errors again I can see that a lot of the files were likely being changed by tests or builds. I should have added them to an ignore file so that their changes were not detected by svn.

svu update 遇到 Node remains in conflict的更多相关文章

  1. 解决linux下svn update 产生Node remains in conflict的问题

    提交一个文件 服务器上死活更新不了 是因为有冲突,解决办法:svn revert --depth=infinity /var/SvnProject/APITest 再次执行更新 进有改动的文件夹,更新 ...

  2. svn update 产生Node remains in conflict的问题

    输入:sudo svn revert --depth=infinity frontend/web/js/workplace/organization.js 最后在执行 svn  up  就ok了

  3. 解决 SVN Skipped 'xxx' -- Node remains in conflict

    svn 提交报错 提交命令: svn update 提示代码: Skipped 'ApiController.php' -- Node remains in conflict At revision ...

  4. Node remains in conflict,svn冲突解决办法

    修改问价svn 提交后其他客户端svn update更新时出现以下问题 Updating '.':Skipped 'Hi3559_Stream' -- Node remains in conflict ...

  5. svn 冲突Skipped ‘inm/inm/templates‘ -- Node remains in conflict

    svn在删除后,提交,更新操作后可能会报, svn update inm/inm -r 1586 Updating ‘inm/inm‘: Password: Skipped ‘inm/inm/temp ...

  6. SVN报错:Node remains in conflict显示冲突的解决办法

    如果是提示文件冲突: svn revert --depth=infinity 有冲突的文件名 如果提示目录有冲突: svn revert --depth=infinity 目录名 搞定.

  7. Aborting commit: 'XXXXXXXX'remains in conflict错误

    今天在提交项目文件到本地SVN时提示错误如下: 过期:”global.php“在事务”21-1“, You have to update your working copy first. 运行upda ...

  8. svn提交时提示 Aborting commit: remains in conflict 解决办法

    出现在rename一个目录时,再提交时一直报错 Aborting commit: remains in conflict 使用右键菜单 svn - resolve 即可解决.用cleanup之类的都没 ...

  9. Aborting commit: 'XXX' remains in conflict

    Aborting commit: 'XXX' remains in conflict 错误   本地也删除了一个文件夹,用svn 的repo-brower 删除了服务器上的对应的文件夹 ,再次comm ...

随机推荐

  1. Js解析浏览器路径的方法

    方法如下:function parseURL(url) { var a = document.createElement('a'); //创建一个链接 a.href = url; return { s ...

  2. 接入WebSocket记录

    为什么用 WebSocket 因为APP里面有个聊天功能,需要服务器主动推数据到APP.HTTP 通信方式只能由客户端主动拉取,服务器不能主动推给客户端,如果有实时的消息,要立刻通知客户端就麻烦了,要 ...

  3. nginx 参数详解

    nginx的http web功能     必须使用虚拟机来配置站点:每个虚拟主机使用一个server{}段来配置     非虚拟主机的配置.公共选项,需要定义在server之外,http之内      ...

  4. Android 使用Socket进行通信(Android)

    一.服务器程序 服务器程序需要在PC上运行,该程序比较的简单,因此不需要建立Android项目,直接定义一个JAVA类,并且运行该类即可.它仅仅建立ServerSocket监听,并使用Socket获取 ...

  5. JMeter学习(三十四)测试报告优化

    如果按JMeter默认设置,生成报告如下: 从上图可以看出,结果信息比较简单,对于运行成功的case,还可以将就用着.但对于跑失败的case,就只有一行assert错误信息.(信息量太少了,比较难找到 ...

  6. ko trick

    (1)let a = ko.observable(‘A’)绑定到select,如果下拉列表中找不到'A', 变量a会赋值成undefined.   要解决此问题可以使用绑定valueAllowUnse ...

  7. chrome浏览器调试typescript

    在chrome的开发人员工具的配置项中,有一个sourcemap的选项,用来配置javascript源码和生成代码的关系. 如果能在浏览器中直接调试typescript代码,才能让我们真正体会到typ ...

  8. J2EE与JavaWeb的区别

    1.Java分类 Java分为JavaSE(Java标准版).J2EE(Java企业版)和JavaME(Java微型版): JavaSE(Java Standard Edition),一般用来开发桌面 ...

  9. java.sql.SQLSyntaxErrorException: ORA-00936: 缺失表达式。

    今天遇到一个很奇怪的问题,sql报表达式错误,于是我把报错的那句sql(红色)放到数据库中执行,没有报错啊!百思不得其解! 呼!我已经提醒自己去注意看黑色的console信息了,得到了传参的参数值,但 ...

  10. 利用Socket远程发送文件

    思想: 1.注意使用两个通道,一个普通对象通信通道,另一个纯净的文件字节流通道 2.利用通信通道发送文件请求,新建字节流通道,开始发送文件