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. Lua参数绑定函数实现方法

    背景 对于某一个函数, 其被调用多次, 每次调用的入参都是一致的. 不想每次都填写参数, 如果能够定义一个新的函数, 将参数跟此函数绑定就棒哒哒了. local function pirntfunc( ...

  2. Unable to the boot Simulator ! Mac开机现“CoreTelephony Trace File Error”,

    OS X升级到El Capitan之后,提供一个跟安全相关的模式叫SIP(System Integrity Protection),又称rootless mode,这个新功能在強化OS X的安全性,它 ...

  3. C# 利用SQLite对.DB和.logdb加密和解密和SQLite创建数据库

    1.最近研究了下利用SQLite为db文件简单的加密和解密 private static SQLiteConnection GetConnection() { SQLiteConnection con ...

  4. 个人训练记录-赛码"bestcoder"杯中国大学生程序设计冠军赛

    A.Movie 题意是给n个线段,要求求出是否存在三个不相交的线段,是的话输出yes,否则输出no.根据贪心的想法,可以先找出右端点r'最小的线段,他是三条线段中最左的那条,再找出左端点l'最大的线段 ...

  5. java布局学习 (一)

    Java 程序通过jvm可以很好的移植到其他平台上,但是java 生成的图形界面样式,在不使用布局的情况下,往往需要重新设定大小,才能在新的平台上调整到最佳样式.这是由于组件的最佳大小 往往是与平台相 ...

  6. [liusy.api-SMJ]-SMJ 介绍 学习阶段(二)

    我选择的是  Spring + Mybatis + Jesery 无状态架构方案. JAVA 比较常用的架构 SSH spring struts2 hibernate流行一阶段后, SSM   spr ...

  7. just555 对话

    网易 新闻 2005-03-31 16:37:47 空!(19194697)555,你在大连炒单,单日最大盈利率多少? 2005-03-31 16:37:59 just555(79610908)最大1 ...

  8. SQLServer游标(Cursor) (B)

    游标(Cursor)是处理数据的一种方法,为了查看或者处理结果集中的数据,游标提供了在结果集中一次以行或者多行前进或向后浏览数据的能力.我们可以把游标当作一个指针,它可以指定结果中的任何位置,然后允许 ...

  9. tcp连接listen的backlog剖析

    TCP连接中,最重要的是连接TCP连接上,两个方向之间的各个状态及各个系统调用与状态之间的关系.往往可以以两种图表示,第一种是状态转换图,第二种是连接时序图.如下: 状态图: 时序图:         ...

  10. JAVA中的异常及处理异常的方法

    异常 这是我老师的喜好:就是说一上来就拿一张图给大家看看,过过瘾-_- 这是一张: 异常分类图 来,这里还有一张带中文的常见异常截图!!! 1:先来说说什么是异常吧: 其实就是"阻止当前方法 ...