On Feb 13, 2008 11:26 AM, claym <clay_at_pfd.net> wrote:
>
> I'm a fairly new subversion user, so forgive me if this is some ridiculously
> simple problem that I should be able to figure out on my own.
>
> I just joined a project that never branched it's project and committed
> everything to trunk. After convincing them to use branches, I branched the
> trunk code to what we will call "Branch A" and made a few changes. During
> this same time, some additional changes were made to the trunk code. The
> problem I'm having is that I'd like to merge the changes in the trunk to
> Branch A. But when I try to do this via subclipse, nothing happens.
>
> I've switched to Branch A.
>
> I do Team -> Merge
>
> I select trunk for the "From:" and Branch A to the "To:"
>
> I set both to Head Revision. I hit "Dry Run" or "Merge" and nothing happens.
> I'm clearly doing something wrong - what is it?
>
> I've been able to merge from Branch A -> Trunk, but the other direction
> simply isn't happening.
This is all going to be real easy when 1.5 comes out.
For now, think of merge as create a diff and apply a patch. You
select the working copy you want to apply the patch to and take the
merge option. The criteria for the merge command is what it would
take to produce the right patch. In your example, both the From and
To URL should be trunk. The from revision should be the revision when
the branch was created and the to revision is HEAD or whatever
revision you want to merge up to. You can use the Select button and
then just select this range in the dialog and it will fill it in for
you.
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subclipse.tigris.org
For additional commands, e-mail: users-help_at_subclipse.tigris.org
Received on 2008-02-13 17:44:44 CET