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

Re: Question regarding merging branches

From: Dylan Cuthbert <dylan_at_q-games.com>
Date: 2002-09-09 09:55:56 CEST

Oh this is silly... I'll delete the line from Philip's original mail that's
causing the problem.

"Philip Martin" <philip@codematters.co.uk> wrote in message
news:87wupzp5et.fsf@codematters.co.uk...

> I suspect the command Dylan wants to run is
>
> *** line deleted ***
>
> where N and M are the revisions before and after the branch change.
> This will merge the change made on the branch into the trunk. A merge
> command using -rN:M only has two arguments becauee the two revisions
> combine with the first argument to provide two URLs.

Hi there,

I tried this, I got a "U Makefile" message, but still no conflicts.

It managed to merge in some non-conflicting lines I had added to the
branched version ok. However the lines I added in right at the top of both
the branch and trunk versions of the file to try and cause a conflict are
nowhere to be seen - the "trunk" version seems to have taken priority for
the conflict.

Here's the order of events again:

I svn copy'd a branch
I then edited file "A" in that branch, changing the top line to read "clash
test"
I then committed
I then edited the "A" file in the trunk, changing the top line to read
"conflict central"
I then committed
I then edited the "A" file in the branch, changing line 20 or so to read
"non-conflicting merge"
I then committed

I then svn merge -r branch_version:latest_version branch-version
trunk-version (local checked-out directories)

I am now trying to merge the branch back into the trunk, it is merging
"non-conflicting merge", but file "A"'s first line reads "conflict central".
In my mind I should get a conflict or the branches' changes are being
selectively ignored.

What am I not "getting"?

---------------------------------
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 Mon Sep 9 09:59:38 2002

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