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

svn not merging properly

From: BlueWolf_ <josr91_at_gmail.com>
Date: Thu, 12 Mar 2009 03:46:06 -0700 (PDT)

I am using svn for a long time, now. I know the concept of branches and
merging, but haven't done it until now.

Just for the information: I got a project in /trunk/Client in the repos
'BDJ4' which was added in r2 and is now in r27. So i did the following thing
to make a branche: 'svn copy svn://telesto/BDJ4/trunk/Client

/branches/Client-tablet is now in r29, which is just a copy of
/trunk/Client. Nothing has been changed. I just tried to merge it, expecting
to return nothing, as there's nothing no merge...

after a checkout of Client-tablet, I did this: 'svn merge

This is where the fun begins... first of all, is says:

--- Merging r3 through r29 into '.':

That doesn't sounds good. Why all those previous revisions? It then tries to
merge all changes I made between those revisions, which result in a conflict
(while the diff shows it can easily be merged anyway...). Every single
change results in a conflict, for example:

Conflict for property 'svn:ignore' discovered on ''.

Select: (p) postpone, (df) diff-full, (e) edit, (r) resolved,

        (h) help for more options: df

--- .3.tmp di mrt 10 14:53:52 2009

+++ .4.tmp di mrt 10 14:53:52 2009

@@ -1 +1,2 @@



Anyway, I did 'mf' on all conflicts... after that, svn status shows nothing.
svn commit does nothing too. Nothing has changed, even the properties with
wich revisions has been merged. doing svn merge again results in the
conflicts with the same files and the same revisions... help?

I think I gave very much info about what I did, does anybody know what I'm
doing wrong? I just copied a trunk, and merging will try to merge every
revisions BEFORE the copy, I guess..

Thank you in advanced,


View this message in context: http://www.nabble.com/svn-not-merging-properly-tp22472781p22472781.html
Sent from the Subversion Users mailing list archive at Nabble.com.
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-03-12 11:46:53 CET

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

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