[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: Johnathan Gifford <jgifford_at_wernervas.com>
Date: Tue, 26 Aug 2008 16:57:30 -0500

>> 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? 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.

>> 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.

---------------------------------------------------------------------
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 23:58:33 CEST

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