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=2376279

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-07-28 15:16:41 CEST