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

Fwd: 3rd-party merging tools? Recommendations?

From: Emmanuel Blot <manu.blot_at_gmail.com>
Date: 2006-02-12 23:50:46 CET

I'm using BC2, and AFAIK, BC2 cannot use the intermediate files.
If you launch BC2 from TortoiseSVN, BC2 can only compare the previous
version to the current (uncommited) version of a file, it does not
handle the other files. In other words, you can use it for diffing and
simple merging, not for resolving conflicts as you can do with
TortoiseMerge.

As BC2 only supports 2-way merge, I don't think it can make use of the
other files, but I don't think I have explored all the BC2 features.

Cheers,
Manu

On 2/12/06, Rory Clark <rory@clarkzoo.org> wrote:
> I'm not quite sure what you're implying here, but let me try to muddle my
> way through it in terms of BC2. Tortoise hands it a couple of files, the
> .mine and others, for it to diff. I haven't had to do a merge yet in
> TortoiseSVN, but I've done it in TortoiseCVS, and it would throw up a dialog
> saying which file will be the one kept in the repository after you do your
> merging. I don't think that the TortoiseSVN will be much different in that
> regards.
>
> -----Original Message-----
> From: Matt England [mailto:mengland@mengland.net]
> Sent: Sunday, February 12, 2006 2:25 PM
> To: rory@clarkzoo.org
> Cc: 'Bart Robinson'; 'Matthew England'; 'SVN Users email list'
> Subject: RE: 3rd-party merging tools? Recommendations?
>
>
> Do all of these software utilities (the ones below) automatically read and
> manage the svn-conflict-generating files (eg, .mine, .rXX, etc)?
>
> -Matt
>
> At 2/12/2006 01:11 PM, Rory Clark wrote:
> >I use BeyondCompare 2 (http://www.scootersoftware.com/) for both
> >diff'ing and merging, especially since you see the two files side by
> >side and then have ability to manually align (in the case code blocks
> >that have moved around), copying lines from one side to the other,
> >manually editing lines, and, of course, saving those changes back to
> >disk.
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>

--
Manu
--
Manu
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Feb 12 23:52:15 2006

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