----- Original Message -----
From: "Claude Montpetit [Nertec]" <cmontpetit@nertec.com>
To: <users@subversion.tigris.org>
Sent: Friday, October 29, 2004 8:51 AM
Subject: Re: How to merge branch back to trunk when branch is in sync with trunk
>>
>> We had a long-life branch that received a couple of merges from the trunk.
>>
>> revision 81: created branch X from trunk HEAD.
>> ...
>> revision 100: merged trunk into branch X - 82:99
>> ...
>> revision 150: merged trunk into branch X - 100:149
>>
>> The branch X now contains all changes in the trunk (HEAD). I want to
>> apply all changes that were made to the branch X back in the trunk.
>
> From reading about this here and there, and trying it locally, it seems
> that if I merge the branch X from version 81:HEAD into the trunk, I get
> the desired results. But although the commit on the trunk after this
> merge shows only the branch X modified files, somehow, this operation
> seems not right to me. Is this the way to proceed?
This seems EXACTLY right to me. Branch X already contains all the
trunk changes, so why should the modified trunk after the merge
contain anything except the changes from X?
Please describe what you think the trunk commit should have also
contained.
Raye
> > But the branch contains the trunk.
>>
>> I tried merging the HEAD of branch X into the trunk working copy but the
>> merge does not merge anything. So I feel I am in trouble. Anyone has a
>> recommendation as of what to do in this situation?
>>
>> Claude
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
>> For additional commands, e-mail: users-help@subversion.tigris.org
>>
>>
>>
>> .
>>
>
>
> --
> Claude Montpetit
> Nertec
>
> ---------------------------------------------------------------------
> 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 Fri Oct 29 18:48:54 2004