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

svn merge says I have conflicts in repository when files have not been updated ?

From: Francois Beausoleil <fbos_at_users.sourceforge.net>
Date: 2003-07-16 19:29:13 CEST

Hi !

I have a repository in which I am trying to port changes from a branch to
trunk. Here's a concise history of the repository:
    r1: Imported data into trunk/
    ... (Unrelated changes)
    r5: Created branch
    r6: Delete files in trunk/
    r7: svn merge trunk@5 trunk@6 into branch
    r8: Update files in branch

Now, when I run the following commands, svn gives me conflicts:
D:\wc\compta>svn info
Url: http://.../trunk/A
Revision: 8

D:\wc>svn merge http://.../branches/A@7 http://.../branches/A@8
C compta.lib
C compta.exe

Why are these files in conflict ? Last time they were updated was in
trunk/, at rev 1. They were not modified in between. There's probably
something I do not understand about branching and merging here...

I am using Subversion
svn, version 0.25.0 (r6433)
   compiled Jul 10 2003, 22:05:10

On Win2K SP3.

Thanks !
Developer of Java Gui Builder

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jul 16 19:30:23 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.