[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: Philip Martin <philip.martin_at_wandisco.com>
Date: Thu, 19 Aug 2010 20:24:38 +0100

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?

-- 
Philip
Received on 2010-08-19 21:25:21 CEST

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