Dietrich Travkin <travkin@gmx.de> wrote on 06/17/2006 05:12:33 AM:
> I'm new to Subclipse and did use the CVS plug-in before. After starting
> some new projects shared in a SVN repository I'm missing a very useful
> feature that is available for the CVS plug-in: That is to preview a
> merge in the synchronize view having the possibility to compare each of
> the files that are different in the revisions/branches.
>
> Without this feature it takes to much effort to preview the changes that
> a merge would do: A unified diff is difficult to read and takes to much
> effort and time while a dry run does not provide enough information
> about the changes.
>
> Is it planed to provide this feature to Subclipse in the future?
No. We are not providing this because we are basing Subclipse on the
capabilities of the Subversion API, specifically JavaHL.
I do a lot of merges, and I personally cannot see the value in this
feature. I suspect that is because I am very familiar with Subversion and
its approach to merge, and do not have any real CVS experience. Anyway,
after doing a merge into your working copy you can do Compare with -> Base
Revision to get an accurate picture of everything the merge did. This can
then be edited/refined or even just use Team -> Revert if you want to undo
it. This approach performs well, is 100% accurate/consistent with
Subversion and lets you leverage the automation of the Subversion merge
process.
If having this feature is critical to you, I'd recommend that you try the
Subversive plugin. They are attempting to handle merge using the approach
you desire. AFAIK, they are still working this out. I suspect that
JavaSVN must be working some real magic for them under the covers to make
it work correctly.
Mark
_____________________________________________________________________________
Scanned for SoftLanding Systems, Inc. and SoftLanding Europe Plc 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 Sat Jun 17 14:46:20 2006