[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: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2003-05-20 16:08:51 CEST

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.

---------------------------------------------------------------------
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:10:35 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.