Re: Mergin old style problem (bug?)...

Ryan,

in short, yes. I actually did a proper merge, but then discovered that
some files have not changed at all. At first I thought that I somehow
messed up with bringing the vendor branch up to date, but then I saw that
the merge from vendor branch into my trunk is not working properly. The
--dry-run parameter is only there so I don't replay the same thing over
trunk in my tests.

Funnily enough, I did the same thing (but with a different product) on the
same repository only a few hours ago, and it was successful.

Could it be that my WC got corrupted?

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
From:
Ryan Schmidt <subversion-2009b_at_ryandesign.com>
To:
Miha Vitorovic <mvitorovic_at_nil.com>
Cc:
users_at_subversion.tigris.org
Date:
28.07.2009 15:15
Subject:
Re: Mergin old style problem (bug?)...
On Jul 28, 2009, at 08:02, Miha Vitorovic wrote:
> 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)
[snip]
> $ 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
Do I understand correctly: the problem you are reporting is that svn 
merge --dry-run is showing only functions.php to be modified...
> $ 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
[snip]
...but svn diff of constants.php shows that it too is modified? Your 
question is why constants.php was not listed when you did the dry run?
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2376348
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].