[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: Rory Clark <rory_at_clarkzoo.org>
Date: 2006-02-13 00:30:01 CET

Through the use of two computers, I forced a file to be conflicted.
Tortoise told me they were conflicted and fired up BC2, which said the files
didn't match. No surprise there. BC2 showed the two files,
DocumentViewer.ascx.r60 and DocumentViewer.ascx.r61, side by side and I was
able to edit and merge right there. BC2 did not detect that these were
essentially HTML files, but when I set the compare mode HTML everything was
happiness.
 
This is all well and good, but apparently not enough for a Three Way Merge.
What would lead to a situation where I would need worry about doing a three
way merge? Near as I can tell, conflicts are typically a two way merge kind
of thing.
 
Thanks!

-----Original Message-----
From: Matt Doran [mailto:matt.doran@papercut.biz]
Sent: Sunday, February 12, 2006 2:56 PM
To: rory@clarkzoo.org
Cc: 'Matthew England'; 'Bart Robinson'; 'SVN Users email list'
Subject: Re: 3rd-party merging tools? Recommendations?

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 Mon Feb 13 00:32:28 2006

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