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

[Subclipse-users] Merging to branch from old branch/trunk?

From: claym <clay_at_pfd.net>
Date: Wed, 13 Feb 2008 08:26:55 -0800 (PST)

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.

-- 
View this message in context: http://www.nabble.com/Merging-to-branch-from-old-branch-trunk--tp15459849p15459849.html
Sent from the subclipse - users mailing list archive at Nabble.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:27:03 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.