Merging to branch from old branch/trunk?

[claym]

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.

[Mark Phippard-3]

On Feb 13, 2008 11:26 AM, claym <clay@...> 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@...
For additional commands, e-mail: users-help@...

[Mark Kirchner-2]

Hi,

claym schrieb:
> I've switched to Branch A.
>
> I do Team -> Merge
>
> I select trunk for the "From:"

Everything's correct so far...

> and Branch A to the "To:"

... but you shouldn't do this. Keep 'Use "From:" URL' checked instead.
Next, click on of the 'Show Log'-buttons and select the revision (or:
range of revisions, using shift-click) from the trunk you want to merge
to the branch. After clicking on 'OK' the two 'Revision'-fields have
been populated; 'Dry Run' and 'Merge' should work as expected now.

> I set both to Head Revision. I hit "Dry Run" or "Merge" and nothing happens.
> I'm clearly doing something wrong - what is it?

First of all, "From:" and "To:" do /not/ refer to source and target of
the merge-operation. The target of the merge-operation is /always/ your
current working-copy.
"From:" and "To:" refer to the first and the last revision to be used
during the merge-operation (or: to be considered by the merge-algorithm).
Please note that the last sentence is not really precise at all, for you
should check chapter 4 of the SVN-book
(http://svnbook.red-bean.com/en/1.4/svn.branchmerge.html) for more info.

HTH,
Mark

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@...
For additional commands, e-mail: users-help@...

[claym]

To both Marks: Thank you! This got me going.