[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 19:22:21 -0400

On Tue, Aug 26, 2008 at 5:57 PM, Johnathan Gifford
<jgifford_at_wernervas.com> wrote:
>>> 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/
> Are there any plans in the future to add this to Subclipse?

I can only speak for myself when I say No.

> While I like the products that CollabNet produces, asking my team mates and other developers who
> use Eclipse to install two (2) add-ons for Subversion to work in Eclipse won't fly and will probably get
> me lynched. Now if the CollabNet Desktop does everything that Subclipse does and all the new
> stuff, then that may work and I'll be glad to give it a whirl.

The CollabNet Desktop is a layer on top of Subclipse that adds
additional functionality. So Subclipse is still there.

>>> 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're blog is looking a little dated. :-) Yep, we do that more than we would like. I was wondering if
> the Merge interface was going to support some of the new tricks like the minus before the revision
> and figure out what the previous revision for the URL was and do it automatically for us.

I believe the way we currently do it is as easy and mistake-free as it
can get. So no plans to support tricks.

Mark Phippard
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-27 01:22:29 CEST

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