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

Question regarding merging branches

From: Dylan Cuthbert <dylan_at_q-games.com>
Date: 2002-09-06 14:32:21 CEST

I have the following

repo/trunk/projects/Makefile

and

repo/branches/test-branch/projects/Makefile

which was svn cp'd at say version "5"

I then edit both of these files (checked out into different places of
course) and commit both changes with no problem. I make sure I edit the
same part of the file to cause a "clash".

I now want to merge repo/branches/test-branch/projects into the trunk. I
type this:

( I am in the checked out trunk/projects directory )

svn diff http://svnserver/svn/repo/branches/test-branch/projects . <= note
the "."

and I am shown this:

Index: Makefile
===================================================================
--- Makefile
+++ tmp.35072.00001 2002-09-06 21:28:15.000000000 +0900
@@ -1,4 +1,4 @@
-# a test commit
+#conflict central

#---------------------------------------------------------------------------

----
 #
 #             Makefile for gnu-make
@@ -9,7 +9,6 @@
 #                (c) 2001,2002 Q-Games
 #
#---------------------------------------------------------------------------
----
-# is it working!?
 #
 # set PROJECT to project name (target file derives from this)
 # set PROJECTS_DIR to base directory of all projects
When I do an svn merge it doesn't modify the trunk's Makefile - why not?
What am I doing wrong?  I'm new at this so maybe there's something I'm not
grasping.
I get this when I do a merge:
 $ svn merge http://svnserver/svn/repo/branches/test-branch/projects .  <=
note the "."
_  Makefile
Shouldn't I get a conflict to fix?
Regards
---------------------------------
Q-Games, Dylan Cuthbert.
http://www.q-games.com
P2P internet radio - http://www.peercast.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Sep 6 14:35:12 2002

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