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

Strange conflicts during merge

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


        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 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 15:41:21 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.