strange merge conflict

Hi all,

this is our first branching in years, so bear with me when I haven't
got the concept from reading the book.

Server is SVN 1.5.1 on Win2K, client SVN 1.4.6 on WinXP (update
postponed as currently a reboot is not wished [TortoiseSVN being
the regular client]). Actually it was by way of TSVN we
encountered the following:

-- branched the whole tree from trunk in rev. 2663

-- file xrates.py was partly rewritten and committed on trunk in rev.
2676

-- the file was not touched on the branch yet, but the current
version is needed for future work and was attempted to be merged
from trunk (dry-run). TSVN reported a conflict. The diff reveals
none.

Doing things from commandline now the following strange things
revealed:

$svn st -v xrates.py
                        2676 2576 jhn xrates.py

$svn merge -r 2675:2676 --dry-run http://hulot.svnserver.com/svn/repos1/trunk/internet
C xrates.py

$svn merge -r 2675:2676 --dry-run http://hulot.svnserver.com/svn/repos1/trunk/internet/xrates.py
C xrates.py

$svn merge -r 2674:2676 --dry-run http://hulot.svnserver.com/svn/repos1/trunk/internet
C xrates.py
U Cigarbox-Design\index.php
U Cigarbox-Design\gallery\index.php
U Cigarbox-Design\gallery\index_d.php
U Cigarbox-Design\index_d.php

$svn merge -r 2674:HEAD --dry-run http://hulot.svnserver.com/svn/repos1/trunk/internet
C xrates.py
U Cigarbox-Design\index.php
U Cigarbox-Design\gallery\index.php
U Cigarbox-Design\gallery\index_d.php
U Cigarbox-Design\index_d.php

$svn merge -r 2663:HEAD --dry-run http://hulot.svnserver.com/svn/repos1/trunk/internet
[...]
U Domains\hogarth\scroll_e.js
U xrates.py
U Marine\robots.txt
[...]

$svn merge -r 2676 --dry-run xrates.py
U xrates.py

In short, if the whole range from rev. 2663 (branching off) to HEAD
is merged, xrates.py is correctly identified as Updated. Likewise
when addressed specifically at rev. 2676 when it was modified on
trunk.

Yet when only rev. 2676 is addressed or just a range around
xrates.py - and only this file - is identified as Conflicted.

What is going on here? BTW branching was done when the server
already was updated to 1.5.1. As it is just this one single file I am
inclined to give the conflict a chance, but would prefer some better
knowledge beforehand.

TIA

Jan Hendrik
---------------------------------------
Freedom quote:

     Je mehr Freiheit, desto weniger Gleichheit;
     je mehr Gleichheit, desto weniger Freiheit.
               -- Max Horkheimer

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-08-11 12:16:54 CEST