[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: Stefan Sperling <stsp_at_elego.de>
Date: Fri, 17 Jul 2009 00:05:27 +0100

On Thu, Jul 16, 2009 at 02:47:42PM +0100, Julian Foad wrote:
> On Thu, 2009-07-16 at 15:13 +0200, Arfrever Frehtes Taifersar Arahesis
> > I use Subversion trunk r38429.
>
> I get success with r38429 in my normal configuration, but a conflict if
> I specify --config-dir=(some empty dir). My normal config directory has
> "diff-cmd" and "diff3-cmd" both invoking Kdiff3. I think Kdiff3 performs
> the merge successfully whereas Subversion's internal merge throws a
> conflict.

The conflict also happens with 1.6.x.

For 1.6.x, the script needs to be tweaked like this:

--- subversion-conflict.sh.orig 2009-07-17 00:04:02.000000000 +0100
+++ subversion-conflict.sh 2009-07-17 00:00:49.000000000 +0100
@@ -8,7 +8,7 @@
 "${SVN}" co --depth=empty -r3330 https://svn.kvirc.de/svn/trunk/kvirc@3330 kvirc_trunk
 cd kvirc_trunk
 "${SVN}" up -r3330 CMakeLists.txt
-"${SVN}" patch ../kvirc-MANUAL_REVISION.patch
+patch -p0 < ../kvirc-MANUAL_REVISION.patch
 
 # Uncomment to avoid this bug
 #"${SVN}" up -r3331

Stefan
Received on 2009-07-17 01:05:54 CEST

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