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

Re: 3rd-party merging tools? Recommendations?

From: Matt Doran <matt.doran_at_papercut.biz>
Date: 2006-02-12 23:56:05 CET

Hi,

I too use Beyond Compare for diffing (it's a fantastic tool!). They
don't have a 3-way merge tool, but are apparently developing one (which
I'm looking forward too).

In the meantime I use TortoiseMerge to do conflict edits. If you use
TSVN, when a file has a conflict you can right-click it in Explorer and
"Edit Conflicts", which opens up TortoiseMerge with the 3 files (.mine,
.rXX, etc).

Hope that clarifies a little.
Matt

Rory Clark 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
>
>
>
Received on Sun Feb 12 23:57:41 2006

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