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

Merge between a legitimate branch and an alien one

From: garbage <lionel.grenier_at_gmail.com>
Date: 2006-12-14 23:47:29 CET

Hello

I didn't find a very good wording for the merge I'd like to do. So let
me explain my problem.
I have a SVN repository with a trunk and some c++ projects inside.
I've created a branch, called myOwnBranch, with let say revision 1000.

But before I had SVN, one of my friend got a copy of my projects and
started working on them and making changes.
On my side I discovered SVN and started to use it. Nearly at the same
time my friend discovered also SVN and started to use it.

Now we'd like to merge our version and let say add all my changes to my
friend new code.

So I created an empty branch, called buddyBranch, (rev 1001) on my
repository and imported my friend latest code inside (rev 1002).
My working copy is then this buddyBranch and I want to do a svn merge of
all my change from rev 1 to 999 from myOwnBranch and apply them to my
working copy.
When I do that SVN treats all changes as conflicts which in that case is
far for an automatic merge.
The problem I see is that the buddyBranch doesn't have any svn shared
history with myOwnBranch and so when merging SVN can't decide which
version is newer than the other.
Maybe I am of the hook here. But I don't what to do to solve that problem

So my question is : does SVN can handle such particular merge ? if yes
what are the steps I should follow ?

Thank you very much for your help

-lg

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Dec 15 15:48:25 2006

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