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

Re: `svn update` sometimes causes needless text conflicts

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Thu, 16 Jul 2009 13:57:10 +0100

Arfrever Frehtes Taifersar Arahesis wrote:
> Place the attachments in the same directory and run
> subversion-conflict.sh script. Next uncomment one line in this script
> and run it again.
>
> You can use:
> SVN=/path/to/svn ./subversion-conflict.sh

What output did you see? What version of svn are you using? I tried it
(with a version from trunk built a few weeks ago) and got no error:

A CMakeLists.txt
Updated to revision 3330.
+ svn patch ../kvirc-MANUAL_REVISION.patch
U CMakeLists.txt
+ svn up -r3332
G CMakeLists.txt
Updated to revision 3332.

$ svn --version
svn, version 1.7.0 (dev build)
   compiled Jun 25 2009, 09:53:27

- Julian

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2371738
Received on 2009-07-16 14:57:38 CEST

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