[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Strange conflicts during merge

From: Christian van der Leeden <lists_at_logicunited.com>
Date: 2003-05-20 16:46:15 CEST

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


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
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 <lists@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

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Received on Tue May 20 16:48:45 2003

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.