You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Christian van der Leeden <li...@logicunited.com> on 2003/05/20 13:40:23 UTC
Strange conflicts during merge
Hi,
running with subversion 0.23.0 on linux I'm experiencing
conflicts during a merge in a directory which is not present in the
the target (trunk in this case).
here is what I'm doing:
Checking out the trunk
Projects/safenet> svn co http://svn:8080/trunk/safenet
A safenet.trunk/taghistory
A safenet.trunk/dbchanges.txt
A safenet.trunk/build.sh
.... (and so on, its rather long)
Now I'm merging my changes from the tag R38ipc:
svn merge -r 773:863 http://svn:8080/tags/safenet/R38ipc
A webserver/ppp
A webserver/ppp/app
A webserver/ppp/app/en
A webserver/ppp/app/en/men
A webserver/ppp/app/en/men/html
A webserver/ppp/app/en/men/html/live_show_right.html
A webserver/ppp/app/en/men/html/live_show_topleft.html
A webserver/ppp/app/en/men/html/live_show_bottomleft.html
A webserver/ppp/app/en/men/html/live_show_topright.html
A webserver/ppp/app/en/men/html/live_show_top.html
.. (and so on, a lot of stuff added)
The Folder ppp does NOT exist in http://svn:8080/trunk/safenet
The import does point to some conflicts with existing files.
Next I'll query the status and I get conflicts in a directory which is
only present in http://svn:8080/tags/safenet/R38ipc.
svn status
C + webserver/ppp/Admin/img/b_addimage.gif
? webserver/ppp/Admin/img/b_addimage.gif.older
? webserver/ppp/Admin/img/b_addimage.gif.yours
C + webserver/ppp/Admin/img/b_archive.gif
? webserver/ppp/Admin/img/b_archive.gif.older
? webserver/ppp/Admin/img/b_archive.gif.yours
C + webserver/ppp/Admin/img/b_cancel.gif
? webserver/ppp/Admin/img/b_cancel.gif.older
? webserver/ppp/Admin/img/b_cancel.gif.yours
C + webserver/ppp/Admin/img/b_del.gif
? webserver/ppp/Admin/img/b_del.gif.older
? webserver/ppp/Admin/img/b_del.gif.yours
C + webserver/ppp/Admin/img/b_done.gif
? webserver/ppp/Admin/img/b_done.gif.older
? webserver/ppp/Admin/img/b_done.gif.yours
Any hints on what I'm doing wrong here?
Christian
----------------------------------------------
Christian van der Leeden
Logic United GmbH
Tel: 089-189488-66 Mob: 0163-3747111
www.logicunited.com
Re: Strange conflicts during merge
Posted by Michael Wood <mw...@its.uct.ac.za>.
On Tue, May 20, 2003 at 03:21:29PM +0100, Philip Martin wrote:
[snip]
> Indeed, it's a bug with merges that add binary files. The problem
> above can be reproduced
>
> rm -rf repo wc
> svnadmin create repo
> svn mkdir file://`pwd`/repo/zig
> svn mkdir file://`pwd`/repo/zig/zag
> svn mkdir file://`pwd`/repo/foo
> svn import file://`pwd`/repo/zig/zag /bin/ls zog
> svn co file://`pwd`/repo/foo wc
> svn merge -r1:HEAD file://`pwd`/repo/zig wc
Modifying the above recipe slightly... If you add a text file, and
manually set the svn:mime-type prop to something that is not recognised
as text, it also fails:
rm -rf repo wc
svnadmin create repo
svn mkdir -m "" file://`pwd`/repo/zig
svn mkdir -m "" file://`pwd`/repo/zig/zag
svn mkdir -m "" file://`pwd`/repo/foo
svn co file://`pwd`/repo/zig/zag wc
cp /etc/shells wc
svn add wc/shells
svn ps svn:mime-type something/something wc/shells
svn ci -m "" wc
rm -rf wc
svn co file://`pwd`/repo/foo wc
svn merge -r1:HEAD file://`pwd`/repo/zig wc
svn st wc
Setting other props instead of svn:mime-type or setting svn:mime-type to
text/plain work fine.
--
Michael Wood <mw...@its.uct.ac.za>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Strange conflicts during merge
Posted by Ben Collins-Sussman <su...@collab.net>.
Philip Martin <ph...@codematters.co.uk> writes:
> > Indeed, it's a bug with merges that add binary files. The problem
> > above can be reproduced
>
> I've raised issue 1319.
Look, everyone! Philip threw an exception! :-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Strange conflicts during merge
Posted by Philip Martin <ph...@codematters.co.uk>.
Philip Martin <ph...@codematters.co.uk> writes:
> Ben Collins-Sussman <su...@collab.net> writes:
> >
> > Interesting that these are "C +", and that they seem to binary files.
>
> Indeed, it's a bug with merges that add binary files. The problem
> above can be reproduced
I've raised issue 1319.
--
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Strange conflicts during merge
Posted by Philip Martin <ph...@codematters.co.uk>.
Ben Collins-Sussman <su...@collab.net> writes:
> > svn status
> > C + webserver/ppp/Admin/img/b_addimage.gif
> > ? webserver/ppp/Admin/img/b_addimage.gif.older
> > ? webserver/ppp/Admin/img/b_addimage.gif.yours
> > C + webserver/ppp/Admin/img/b_archive.gif
> > ? webserver/ppp/Admin/img/b_archive.gif.older
> > ? webserver/ppp/Admin/img/b_archive.gif.yours
> > [...]
>
> Interesting that these are "C +", and that they seem to binary files.
Indeed, it's a bug with merges that add binary files. The problem
above can be reproduced
rm -rf repo wc
svnadmin create repo
svn mkdir file://`pwd`/repo/zig
svn mkdir file://`pwd`/repo/zig/zag
svn mkdir file://`pwd`/repo/foo
svn import file://`pwd`/repo/zig/zag /bin/ls zog
svn co file://`pwd`/repo/foo wc
svn merge -r1:HEAD file://`pwd`/repo/zig wc
and
rm -rf repo wc
svnadmin create repo
svn mkdir file://`pwd`/repo/zig
svn mkdir file://`pwd`/repo/foo
svn import file://`pwd`/repo/zig /bin/ls zog
svn co file://`pwd`/repo/foo wc
svn merge -r1:HEAD file://`pwd`/repo/zig wc
gives a property merge confict.
--
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Strange conflicts during merge
Posted by Christian van der Leeden <li...@logicunited.com>.
Yep, those are images as one can clearly see :-)
And the conflicts during the merge command are in image
files, too.
C webserver/orga/app/en/men/img/curve_top_home.gif
C webserver/orga/app/en/men/img/lay/bg_content.gif
C webserver/orga/app/en/men/img/lay/home_studio.gif
C webserver/orga/app/en/men/img/lay/home_videostreams.gif
C webserver/orga/app/en/men/img/lay/home_logobottom1.gif
C webserver/orga/app/en/men/img/lay/home_dvdshop.gif
C webserver/orga/app/en/men/img/lay/home_private.gif
C webserver/orga/app/en/men/img/lay/home_header.gif
CU
Christian
P.S.: The http://svn:8080/trunk/safenet repository has the last change
at revision number 778 where exactly one java file changed, so there
should not really be a conflict there anyway since all changes are newer
(at least for the binary files and in my understanding of conflict
resolution)
The branch did take place at revision number 777. (from trunk to R38ipc)
On Tuesday, May 20, 2003, at 04:08 PM, Ben Collins-Sussman wrote:
> Christian van der Leeden <li...@logicunited.com> writes:
>
>> svn co http://svn:8080/trunk/safenet
>
> Okay.
>
>> svn merge -r 773:863 http://svn:8080/tags/safenet/R38ipc
>
> Okay.
>
>> The Folder ppp does NOT exist in http://svn:8080/trunk/safenet
>> The merge does point to some conflicts with existing files.
>
> It does? Which ones?
>
>> svn status
>> C + webserver/ppp/Admin/img/b_addimage.gif
>> ? webserver/ppp/Admin/img/b_addimage.gif.older
>> ? webserver/ppp/Admin/img/b_addimage.gif.yours
>> C + webserver/ppp/Admin/img/b_archive.gif
>> ? webserver/ppp/Admin/img/b_archive.gif.older
>> ? webserver/ppp/Admin/img/b_archive.gif.yours
>> [...]
>
> Interesting that these are "C +", and that they seem to binary files.
>
>
>
----------------------------------------------
Christian van der Leeden
Logic United GmbH
Tel: 089-189488-66 Mob: 0163-3747111
www.logicunited.com
Re: Strange conflicts during merge
Posted by Ben Collins-Sussman <su...@collab.net>.
Christian van der Leeden <li...@logicunited.com> writes:
> svn co http://svn:8080/trunk/safenet
Okay.
> svn merge -r 773:863 http://svn:8080/tags/safenet/R38ipc
Okay.
> The Folder ppp does NOT exist in http://svn:8080/trunk/safenet
> The merge does point to some conflicts with existing files.
It does? Which ones?
> svn status
> C + webserver/ppp/Admin/img/b_addimage.gif
> ? webserver/ppp/Admin/img/b_addimage.gif.older
> ? webserver/ppp/Admin/img/b_addimage.gif.yours
> C + webserver/ppp/Admin/img/b_archive.gif
> ? webserver/ppp/Admin/img/b_archive.gif.older
> ? webserver/ppp/Admin/img/b_archive.gif.yours
> [...]
Interesting that these are "C +", and that they seem to binary files.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Strange conflicts during merge
Posted by Christian van der Leeden <li...@logicunited.com>.
Sorry, this is my typo, it should read:
"merge" instead of "import"
>
> The Folder ppp does NOT exist in http://svn:8080/trunk/safenet
> The merge does point to some conflicts with existing files.
>
Christian
On Tuesday, May 20, 2003, at 03:46 PM, Ben Collins-Sussman wrote:
> Christian van der Leeden <li...@logicunited.com> writes:
>
>> The Folder ppp does NOT exist in http://svn:8080/trunk/safenet
>> The import does point to some conflicts with existing files.
>
> Huh? What "import" are you talking about?
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
>
>
----------------------------------------------
Christian van der Leeden
Logic United GmbH
Tel: 089-189488-66 Mob: 0163-3747111
www.logicunited.com
Re: Strange conflicts during merge
Posted by Ben Collins-Sussman <su...@collab.net>.
Christian van der Leeden <li...@logicunited.com> writes:
> The Folder ppp does NOT exist in http://svn:8080/trunk/safenet
> The import does point to some conflicts with existing files.
Huh? What "import" are you talking about?
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org