You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Arfrever Frehtes Taifersar Arahesis <Ar...@GMail.Com> on 2009/07/15 23:59:53 UTC
`svn update` sometimes causes needless text conflicts
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
--
Arfrever Frehtes Taifersar Arahesis
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2371640
Re: `svn update` sometimes causes needless text conflicts
Posted by Julian Foad <ju...@btopenworld.com>.
On Fri, 2009-07-17, Stefan Sperling wrote:
> > > I use Subversion trunk r38429.
>
> The conflict also happens with 1.6.x.
[...]
This bug is filed as issue #3449,
<http://subversion.tigris.org/issues/show_bug.cgi?id=3449>.
I have added a self-contained reproduction script to the issue, and
trimmed down the input files as much as I can while still showing the
bug.
- Julian
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2402188
Re: `svn update` sometimes causes needless text conflicts
Posted by Stefan Sperling <st...@elego.de>.
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
Re: `svn update` sometimes causes needless text conflicts
Posted by Julian Foad <ju...@btopenworld.com>.
On Thu, 2009-07-16 at 15:13 +0200, Arfrever Frehtes Taifersar Arahesis
wrote:
> 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.
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.
- Julian
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2371755
Re: `svn update` sometimes causes needless text conflicts
Posted by Arfrever Frehtes Taifersar Arahesis <Ar...@GMail.Com>.
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
Re: `svn update` sometimes causes needless text conflicts
Posted by Julian Foad <ju...@btopenworld.com>.
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