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.
+ rm -fr kvirc_trunk
+ svn co --depth=empty -r3330 https://svn.kvirc.de/svn/trunk/kvirc@3330 kvirc_trunk
Checked out revision 3330.
+ cd kvirc_trunk
+ svn up -r3330 CMakeLists.txt
Updated to revision 3330.
+ svn patch ../kvirc-MANUAL_REVISION.patch
+ 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
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