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

Re: Problem with conflict messages

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Mon, 25 May 2009 19:07:20 +0200

Constantine Dokolas wrote:
>> Constantine Dokolas wrote:
>>> I get these strange conflict messages with TortoiseSVN 1.6.2.16344 (see
>>> attached image). They seem to be the last line of the actual message. In
>>> cases just like this one, I can't figure what the actual problem is (I
>>> don't have the necessary experience to recognise it).
>> Can you please use the command line client (from
>> http://subversion.tigris.org) and run:
>> $ svn info path/to/conflicted/dirorfile
>>
>> and tell us what it says?
>
> Here it is (some names changed; wraps fixed):
[snip]
> Tree conflict: local obstruction, incoming add upon merge

Thanks a lot for that information - I guess I never would have found
that copy/paste error otherwise. Took me quite a while to spot that
problem even though it's perfectly obvious :)

Fixed in r16449.

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2353586
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2009-05-25 19:07:34 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.