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

AW: Re: I don't understand Subclise's Merge dialog...?!

From: Markus Karg <markus.karg_at_quipsy.de>
Date: 2005-09-06 15:55:47 CEST

the online help doesn't provide an answer to my question. In r21, I created a branch. Now I want to merge back all features of that branch into trunk. So I switch to trunk, then go to merge. I open the log, click on the head, hold shift, click on 21. Now everything between head and 21 (including) is selected. I shall result in svn merge -r21:HEAD. But when I come back from the log view to the merge dialog, there is shown 20 and 29, which results in svn merge -r20:29. And this will not work, since it tries to recreate the copy command done in r20_to_r21. So, my problem is not that I'm not understanding how merge works, but that I do not understand why I select 21 and the dialog uses 20...?!
Mit freundlichem Gruss / With kind regards
Markus KARG, Staatl. gepr. Inf.
Entwicklung / R & D


Von: Mark Phippard [mailto:MarkP@softlanding.com]
Gesendet: Di 06.09.2005 15:18
An: users@subclipse.tigris.org
Betreff: Re: I don't understand Subclise's Merge dialog...?!

"Markus Karg" <markus.karg@quipsy.de> wrote on 09/06/2005 04:03:18 AM:

> So why is Subclipse not using the revision I marked but decreases that
> I don't understand that behaviour and actually experienced that using
> manual command is line easier than to use Subclipse's merge dialog...?!

As of 0.9.33, this is all documented pretty well in the help. With the
dialog up, press F1 and then click on the link to Reference: Team-> Merge.


Scanned for SoftLanding Systems, Inc. by IBM Email Security Management Services powered by MessageLabs.

To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Tue Sep 6 23:55:47 2005

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.