Thanks for the quick response Mark. I do understand this now. I think I
answered my own question too. The way CVS worked is that for every
branch there was a tag created called Root_{branch_name}. This tag
served as a "base revision" or the start of the branch by which to start
all merge operations and was auto-filled when the merge dialog came up
meaning most of the time you never had to do anything but choose a
branch to merge from and the rest was autofilled. Not sure how something
like this could be implemented in SVN or Subclipse but it's something to
think about.
Someone else please chime in if you remember what I'm taking about in
EClipse and CVS.
Bradley
Mark Phippard wrote:
> Bradley Wagner <bradley.wagner@hannonhill.com> wrote on 05/05/2006
> 09:31:39 PM:
>
>
>> This might belong in the SVN mailling list, but I figured that my
>> question was so specific to the UI, it could go here. I'm trying to
>> figure out how to merge a single file from the TIP of a branch back into
>>
>
>
>> the trunk. In CVS, all I would do is just that: merge from branch to
>> HEAD. I do remember that some "base tag" was automatically filled or
>> something. In Subclipse/SVN however, I don't know how to do this without
>>
>
>
>> looking up the revision number of the specific change which seems really
>>
>
>
>> inefficient to me. There doesn't seem to be any notion of a branch's TIP
>>
>
>
>> in SVN. Is there no way to specify the tip or base of a branch without a
>>
>
>
>> specific revision number? What's the best way to locate that revision
>> number when the branch was created assuming there is no way?
>>
>> I'm new to SVN and this might be a rookie mis-understanding about
>>
> merging.
>
> I never did any branching or merging in the brief time I used CVS, so I do
> not really understand what you are asking. Are you saying you just want
> to take the file, as-is, from the branch and put it in trunk? If so, then
> just copy it to trunk. I'd probably just do this outside of Subversion by
> updating the content of the trunk file in my WC based on the contents I
> wanted.
>
> Otherwise, in Subversion, you would talk about this in terms of the
> changes you have made to the file in the branch. For example, branch was
> created at r100, and changes were made to the file in r114, 121 and 156. I
> want to merge those changes to the file in trunk, taking into account that
> there may have been other changes made to the file in trunk since r100.
>
> OK, to do this, you need to have your WC on trunk. Use Team -> Switch if
> needed to switch the URL to trunk. Since you just want one file, select
> the trunk version of the file from your WC, probably from the Package
> Explorer or Navigator view. Do Team -> Merge. Enter the URL to the file
> on the branch as the From URL (it will also be the target URL). Take the
> Show Log button, which will show all of the changes that have happened to
> the file on the branch. Select the range of revisions you want to merge
> and click OK. This will fill in the From and To revisions with the values
> you need to do this. Click OK.
>
> Mark
>
>
>
> _____________________________________________________________________________
> Scanned for SoftLanding Systems, Inc. and SoftLanding Europe Plc by IBM Email Security Management Services powered by MessageLabs.
> _____________________________________________________________________________
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
> For additional commands, e-mail: users-help@subclipse.tigris.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Sat May 6 03:57:32 2006