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

[Subclipse-users] Usage question

From: Eduard Martinescu <eduard.martinescu_at_globalcrossing.com>
Date: Mon, 30 Mar 2009 14:40:18 -0400

So, I'm stuck as to how to accomplish the following using Subclipse....

1) Some time in the past, I created a branch. Let's call that B1 for arguments sake. I did some work on the branch, made commits, then forgot about it.

2) Meanwhile trunk has progressed with it's own set of changes.

3) So far so good, I know how to create a new branch from trunk, and merge all changes originally made to B1 branch to new branch. However, this is where the monkey wrench is thrown in.... At some point there was some reorganization, and branch B1 was renamed/moved to branch B2.

So, now, how do I get all the changes from branch B1 merged into my new branch created fresh from trunk (say B3)?

If I select B2 as the 'source/from' URL, and look at revisions, I only see the copy (assuming the checkbox is on). If de-select the checkbox, then I see all the commits to the repository...not quite what I was looking for. From the command line, I could specify something like svn://vc/root/branch/b1_at_reva where reva is some revision prior to the move to B2. If I do that with the log command, I can see the set of commits effecting B1,upto the copy from trunk that created B1. But how do I translate all that into Subclipse? Trying to add '@reva' to the end of the URL in the 'From' field results in an error....

Running the whole merge from the command line is an option, but it seems to mess up the ability of Subclipse to handle merge conflicts properly (maybe I'm just missing something to the merge command line?)

Anyone have pointers or help they can provide?



Mini timeline:

B1 created from trunk
Commit(s) to B1
B1 renamed/moved to B2
B3 created from trunk

My desire is to merge changes made to B1 over to new B3 (standard merge scenario). The problem is the B1 rename to B2....

Eduard Martinescu
Principal Software Engineer
Global Crossing
Phone (585) 255-1184
Cell (585) 752-9668
 If you don't care about quality, you can meet any other requirement.
-- Gerald M. Weinberg, "The Zeroth Law of Software Engineering".


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2009-03-30 20:40:40 CEST

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.