Re: merge weirdness

On 4/24/06, Marcus Rueckert <darix@web.de> wrote:
> hi,
>
> i have a merge here where i see a lot of:
> [[[
> D doc/ices.txt
> A doc/ices.txt
> ]]]
>
> the actual merge was doe with
>
> "svn merge http://svn.digium.com/svn/asterisk/trunk \
> http://svn.digium.com/svn/asterisk/team/group/autoconf_and_menuselect ."
>
> in a WC of trunk
>
> The branch is up2date with HEAD of trunk with svnmerge.py.
> On svn update i get:
> [[[
> $ svn up
> svn: REPORT request failed on '/svn/asterisk/!svn/vcc/default'
> svn: Working copy path 'build_tools/make_svn_branch_name' does not exist in repository
> ]]]
>
> zhakov found out that all "replaced" files were added r18300. on 1.4 the
> merge works and svn update works aswell. but it is still broken with
> 1.3.x. the attached merge.log was done with 1.3.0.
>
> 2 questions come up:
> why are the files shown as replaced?
It seems like "feature". Files merged as Updated only if they have
common ancestry:
Simple recipe to reproduce (sorry for abs pathname, it's for Windows):
rd /q /s db
rd /q /s wc

svnadmin create db
svn co file:///c:/tmp/qq/db wc
md wc\trunk
svn add wc/trunk
svn ci -m "Create trunk" wc

svn cp wc/trunk wc/branch
svn ci -m "Create branch from trunk" wc

echo trunk foo >wc/trunk/foo
svn add wc/trunk/foo
svn ci -m "Add foo to trunk" wc

rem Comment these two lines and uncomment next two lines for right merge.
echo branch foo >wc/branch/foo
svn add wc/branch/foo

rem svn cp wc/trunk/foo wc/branch/foo
rem echo branch foo >wc/branch/foo

svn ci -m "" wc

svn merge file:///c:/tmp/qq/db/trunk file:///c:/tmp/qq/db/branch wc/trunk

Gives:
C:\tmp\QQ>svn merge file:///c:/tmp/qq/db/trunk
file:///c:/tmp/qq/db/branch wc/trunk
D wc\trunk\foo
A wc\trunk\foo

But if you copy foo from trunk and then modify, you'll get:
C:\tmp\QQ>svn merge file:///c:/tmp/qq/db/trunk
file:///c:/tmp/qq/db/branch wc/trunk
U wc\trunk\foo

As I said before it looks like feature, but could somebody confirm?

> what breaks the WC?
Pre 1.4 WC doesn't support replacements at all.

--
Ivan Zhakov