[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Bug: resolve --accept theirs-conflict does not properly handle paths

From: Doug Reeder <reeder.29_at_gmail.com>
Date: Thu, 19 Aug 2010 12:28:42 -0400

svn, version 1.6.4 (r38063)
    compiled Aug 7 2009, 11:08:17
running under OS X 10.5.8 on a Intel Core 2 Duo (i.e. a 64-bit
processor)

resolve --accept theirs-conflict fails on a CONFLICTED-PATH with a
directory component, but works fine when CONFLICTED-PATH is just a
filename:

~/webOS/workspace/OutlineTrackerRecurD svn resolve --accept theirs-
conflict javascripts/storage.js
svn: warning: Can't open file 'storage.js.merge-left.r448': No such
file or directory
~/webOS/workspace/OutlineTrackerRecurD ls javascripts/storage.js*
javascripts/storage.js javascripts/storage.js.merge-left.r448
javascripts/storage.js.merge-right.r471 javascripts/storage.js.working
~/webOS/workspace/OutlineTrackerRecurD file javascripts/
storage.js.merge-left.r448
javascripts/storage.js.merge-left.r448: UTF-8 Unicode C++ program text
~/webOS/workspace/OutlineTrackerRecurD cd javascripts/
~/webOS/workspace/OutlineTrackerRecurD/javascripts svn resolve --
accept theirs-conflict storage.js
Resolved conflicted state of 'storage.js'

Doug Reeder
reeder.29_at_gmail.com
http://reeder29.livejournal.com/
https://twitter.com/reeder29

https://twitter.com/hominidsoftware
http://outlinetracker.com
Received on 2010-08-19 20:43:55 CEST

This is an archived mail posted to the Subversion Dev mailing list.