Mergin old style problem (bug?)...

Please CC me, as I am no longer on the list!!!

I have on of the merge errors for the first time now. I'm trying to do a
merge from the vendor branch. Can someone shed some light, please?

See transcript below:

$ svn --version
svn, version 1.5.4 (r33841)
   compiled Dec 11 2008, 10:24:53

Copyright (C) 2000-2008 CollabNet.
Subversion is open source software, see http://subversion.tigris.org/
This product includes software developed by CollabNet (
http://www.Collab.Net/).

The following repository access (RA) modules are available:

* ra_neon : Module for accessing a repository via WebDAV protocol using
Neon.
  - handles 'http' scheme
* ra_svn : Module for accessing a repository using the svn network
protocol.
  - with Cyrus SASL authentication
  - handles 'svn' scheme
* ra_local : Module for accessing a repository on local disk.
  - handles 'file' scheme
* ra_serf : Module for accessing a repository via WebDAV protocol using
serf.
  - handles 'http' scheme
  - handles 'https' scheme

 
$ svn merge http://svnserver/svn/web-2.0/vendor/phpBB3/3.0.5/includes
http://svnserver/svn/web-2.0/vendor/phpBB3/3.0.4/includes . --dry-run
--- Merging differences between repository URLs into '.':
U functions.php

$ svn diff
http://svnserver/svn/web-2.0/vendor/phpBB3/3.0.5/includes/constants.php
http://svnserver/svn/web-2.0/vendor/phpBB3/3.0.4/includes/constants.php
Index: constants.php
===================================================================
--- constants.php (.../3.0.5/includes/constants.php) (revision
1259)
+++ constants.php (.../3.0.4/includes/constants.php) (revision
1259)
@@ -25,7 +25,7 @@
 */

 // phpBB Version
-define('PHPBB_VERSION', '3.0.5');
+define('PHPBB_VERSION', '3.0.4');

 // QA-related
 // define('PHPBB_QA', 1);
@@ -185,10 +185,6 @@
 @define('CHMOD_WRITE', 2);
 @define('CHMOD_EXECUTE', 1);

-// Captcha code length
-define('CAPTCHA_MIN_CHARS', 4);
-define('CAPTCHA_MAX_CHARS', 7);
-
 // Additional constants
 define('VOTE_CONVERTED', 127);

Best regards,

---
  Miha Vitorovic
  Inženir v tehničnem področju
  Customer Support Engineer
   NIL Data Communications,  Tivolska cesta 48,  1000 Ljubljana,  Slovenia
   Phone +386 1 4746 500      Fax +386 1 4746 501     http://www.NIL.si
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2376278
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].