[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: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA_at_GMail.Com>
Date: Thu, 16 Jul 2009 15:13:09 +0200

2009-07-16 14:57:10 Julian Foad napisaƂ(a):
> 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.

I get:

$ ./subversion-conflict.sh
+ SVN=svn
+ rm -fr kvirc_trunk
+ svn co --depth=empty -r3330 https://svn.kvirc.de/svn/trunk/kvirc@3330 kvirc_trunk
 U kvirc_trunk
Checked out revision 3330.
+ cd kvirc_trunk
+ svn up -r3330 CMakeLists.txt
A CMakeLists.txt
Updated to revision 3330.
+ svn patch ../kvirc-MANUAL_REVISION.patch
U CMakeLists.txt
+ svn up -r3332
Conflict discovered in 'CMakeLists.txt'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: p
C CMakeLists.txt
Updated to revision 3332.
Summary of conflicts:
  Text conflicts: 1

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

I use Subversion trunk r38429.

-- 
Arfrever Frehtes Taifersar Arahesis

Received on 2009-07-16 15:11:50 CEST

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