If you don't like TortoiseMerge, don't like Subclipse merge, and/or don't use Windoze, you might like to try
KDiff3 <http://kdiff3.sourceforge.net/>.
If you're using Tortoise on Windoze, then make a note of your Merge Viewer and Diff Viewer settings before you install KDiff3, or remember to disable integration with Tortoise during installation.
I quite like what I've seen of this tool so far, but have not yet used it in anger on a really big, complex merge. I have tried many other tools, however, including some commercial evaluations, and have not been entirely satisfied with any. KDiff3 looks quite promising, even though it's still pre-1.0 release.
Rob.
> -----Original Message-----
> From: Mark Phippard [mailto:markp@softlanding.com]
> Sent: 08 November 2006 15:35
> To: SVN MaillingList
> Subject: Subclipse Merge (was: Concurrent versioning = spawn of the
> devil?)
>
>
> Ruslan Sivak <rsivak@istandfor.com> wrote on 11/08/2006 10:29:20 AM:
>
> > Gundersen, Richard wrote:
> > > We use Eclipse with the Subclipse plugin, which is a good client,
> > > although using it to merge is very confusing - its not
> very intuitive.
> > > It works, but getting it to generate the svn merge
> command you expect
> is
> > > sometimes tricky. At the moment, I use Subclipse for
> everything except
> > > merging, for which I use the command line because you
> know exactly
> what
> > > its doing. And of course this is biased towards Java development.
> > >
> > > Richard
> > >
> > We use eclipse with Subclipse as well, and I only learned
> to do merged
> > because how easy eclipse makes it. The merge tool it has
> kind of sucks,
>
> > so I set it up to use the tortoisemerge program for
> conflict resolution,
>
> > but otherwise, it's pretty good.
>
> Subclipse is trying to make the merge process easier, not
> more difficult.
> It follow the same approach as TortoiseSVN. Bring up the
> dialog, enter
> the URL, usually it will be in the drop-down already, then
> use the Select
> button to select the revisions you want to merge. The key is
> to select
> the revisions that you want merged. Do not try to select the
> numbers you
> would enter into the command line, instead select the actual
> revisions
> that contain the changes you want merged. This will then
> populate the
> dialog with the right numbers to merge those revisions.
>
> If you know the numbers you want to use, then just type them
> in instead of
> using the select dialog.
>
> The conflict resolution editor comes from Eclipse. I
> personally prefer
> TortoiseMerge as well, and that is why we made it a preference in
> Subclipse to use an external tool for that.
>
> Mark
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
_____________________________________________________________________
This message has been checked for all known viruses by the MessageLabs Virus Scanning Service, on behalf of Celoxica Ltd.
This email and any files transmitted with it are confidential and
may be legally privileged. It is intended solely for the use of the
individual or entity to whom it is addressed. If you have received
this in error, please contact the sender and delete the material
immediately. Whilst this email has been swept for viruses, you
should carry out your own virus check before opening any
attachment. Celoxica Ltd accepts no liability for any loss or
damage which may be caused by software viruses or interception
or interruption of this email.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Nov 8 17:54:55 2006