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

RE: Re: Problem with conflict messages

From: Constantine Dokolas <cdokolas_at_gmail.com>
Date: Mon, 25 May 2009 09:38:45 -0700 (PDT)

> 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):

svn info CmnPostBuildDbg.bat
Path: CmnPostBuildDbg.bat
Name: CmnPostBuildDbg.bat
URL: http://svnserver/svnrepos/Server/branches/branch1/path/CmnPostBuildDbg.bat
Repository Root: http://svnserver/svnrepos/Server
Repository UUID: d1c4209b-2321-ed49-9b81-6a695b3eb1db
Revision: 93
Node Kind: file
Schedule: normal
Last Changed Author: cd
Last Changed Rev: 63
Last Changed Date: 2009-04-09 14:43:58 +0300 (Πεμ, 09 Απρ 2009)
Text Last Updated: 2009-05-22 17:04:33 +0300 (Παρ, 22 Μαϊ 2009)
Checksum: cc3e46a2d3a6125250b24f5c9f0665a4
Tree conflict: local obstruction, incoming add upon merge
  Source left: (file) http://svnserver/svnrepos/Server/trunk/path/CmnPostBuildDbg.bat@13
  Source right: (file) http://svnserver/svnrepos/Server/branches/branch2/path/CmnPostBuildDbg.bat@94

Thanks in advance.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2353576

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-05-25 18:51:01 CEST

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