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

merging two branches

From: ufuk kocolu <ufuk_at_pilli.com>
Date: 2007-04-23 16:19:14 CEST

Thanks to the input of this group, I managed to dump & load my two
repositories into a new repository. To keep things clean, I loaded these
repositories into

import/repository-1
import/repository-2

Than I created a new branch - of repository-1 - using svn copy into
trunk/. Now what I need to do is merge import/repository-2 to trunk/. So
I run the command:

svn merge --ignore-ancestory file://svn/import/repository-2/app/file1.rb
file://svn/trunk/app/file1.rb checkoutdir/app/file1.rb

That gives me a OK message ("merged") but there is no difference in the
file. It's still identical to import/repository-1/app/file1.rb

What do I need to do to merge these two branches?

Thanks

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Apr 23 16:19:54 2007

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