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

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

From: Doug Reeder <reeder.29_at_gmail.com>
Date: Thu, 19 Aug 2010 22:31:43 -0400

My apologies; it was the other machine that had the up-to-date copy of
Subversion, and I failed to double-check.

On Aug 19, 2010, at 4:20 PM, Stefan Sperling wrote:

> On Thu, Aug 19, 2010 at 08:24:38PM +0100, Philip Martin wrote:
>> Doug Reeder <reeder.29_at_gmail.com> writes:
>>
>>> svn, version 1.6.4 (r38063)
>>
>> That's old.
>>
>>> 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
>>
>> Fixed by r891009?
>
> Yes, it looks like that bug. The fix was released in 1.6.9.
>
> Stefan

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-20 04:32:32 CEST

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