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

Re: merging two branches

From: ufuk kocolu <ufuk_at_pilli.com>
Date: 2007-04-24 13:22:28 CEST

Thing is; I have changes in both versions. Can I merge changes in both
versions into one?

Jason Connor wrote:
> To pick up the changes in import/repository-2, you need to reorder the
> urls in your merger (i.e. import/repository-2 needs to be the
> right-hand-side of the merge)
>
> On 4/23/07, ufuk kocolu <ufuk@pilli.com> wrote:
>>
>> 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
>>
>>
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Apr 24 13:23:05 2007

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