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

Re: [Subclipse-users] Questions On How To Take Advantage Of Merge Tracking

From: Mark Phippard <markphip_at_gmail.com>
Date: Tue, 26 Aug 2008 16:55:43 -0400

On Tue, Aug 26, 2008 at 4:45 PM, Johnathan Gifford
<jgifford_at_wernervas.com> wrote:
> We've been using Subversion and Subclipse for a couple years now. From the very beginning our teams realized the need to keep track of revision numbers when merging and always specified the revision numbers needed for the merge. With the new Merge Tracking features in Subversion 1.5.x, we are looking to see how we can simplify our merge processes.
>
> After searching and reading the Subclipse website and reading the post on CollabNet's blog page, I'm not finding much information about how to take advantage of Merge Tracking in Subclipse. Therefore, I have a few of questions.
>
> Question 1)
>
> How do I achieve the following command line call in Subclipse for simplified re-basing of a branch with trunk?
>
> svn merge http://some.svn.server.com/at/trunk
>
> Question 2)
>
> How do I achieve the following command line call in Subclipse for simplified merging of a branch's changes back to trunk?
>
> svn merge --reintegrate http://some.svn.server.com/at/a/branch

For both of these you would need to install the CollabNet Desktop and
use the merge client it provides on top of Subclipse.

http://desktop-eclipse.open.collab.net/

> Question 3)
>
> How can I achieve the following command line call in Subclipse to see the commit messages over the entire history of a file or directory?
>
> svn log -g

In the History view there is a drop-down for "Include Merged
Revisions". This adds a merged revisions column to the view.

> Question 4)
>
> How can I achieve the following command line call in Subclipse to rollback a single change in a branch or trunk?
>
> svn merge -c -303 http://some.svn.server.com/at/trunk

The best way is described here:

http://markphip.blogspot.com/2007/01/how-to-undo-commit-in-subversion.html

You can certainly fill out the Subclipse merge dialog with From
revision = 303 and To revision = 302 as well.

-- 
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-08-26 22:55:58 CEST

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