On Monday, April 01, 2013 12:53:23 Walter Bright wrote:
> Life has gotten a lot easier for me trying to manage multiple branches of D since I've been using file compare/merge tools.
> 
> I use winmerge for Windows, and meld for Linux. They are both free, and work great.
> 
> What do you use?


Being an avid KDE user, I use kdiff3, and it works quite well, but I also don't find that I need to use merge tools very often.

- Jonathan M Davis

On 2013-04-01 21:53, Walter Bright wrote:
> Life has gotten a lot easier for me trying to manage multiple branches
> of D since I've been using file compare/merge tools.
>
> I use winmerge for Windows, and meld for Linux. They are both free, and
> work great.
>
> What do you use?

On Mac OS X, for git, the git bundle in TextMate and Gitx. For non git related diffs and merges I use FileMerge and/or Kdiff3. FileMerge is pretty good but chokes on large files. Kdiff3 has a horrible UI on Mac OS X.

-- 
/Jacob Carlborg

On Monday, 1 April 2013 at 23:06:10 UTC, Jonathan M Davis wrote:
> On Monday, April 01, 2013 12:53:23 Walter Bright wrote:
>> Life has gotten a lot easier for me trying to manage multiple branches of D
>> since I've been using file compare/merge tools.
>> 
>> I use winmerge for Windows, and meld for Linux. They are both free, and work
>> great.
>> 
>> What do you use?
>
>
> Being an avid KDE user, I use kdiff3, and it works quite well, but I also don't
> find that I need to use merge tools very often.
>
> - Jonathan M Davis

I've used kdiff3 on Windows and Linux before I switched to Emacs for all sw-realted tasks. From now on I use ediff for viewing diffs as well as resolving git merge conflicts. It has really nice integration with magit, an Emacs git front-end and may I say the best git front-end there is.

Although, "simple installation" (well, configuration in that case) is not something you can tell about it. It looks awkward out-of-the-box, but it's fully customizable. Personally, I don't find it that hard and think the result worth every bit of effort. But for many people it's like "do I really have to do this arcane stuff just to see the diff?"

On 1 April 2013 20:53, Walter Bright <newshound2@digitalmars.com> wrote:

> Life has gotten a lot easier for me trying to manage multiple branches of D since I've been using file compare/merge tools.
>
> I use winmerge for Windows, and meld for Linux. They are both free, and work great.
>
> What do you use?
>

Meld all the way.

-- 
Iain Buclaw

*(p < e ? p++ : p) = (c & 0x0f) + '0';

On 01/04/2013 20:53, Walter Bright wrote:
> Life has gotten a lot easier for me trying to manage multiple branches
> of D since I've been using file compare/merge tools.
>
> I use winmerge for Windows, and meld for Linux. They are both free, and
> work great.
>
> What do you use?

Nowadays, CSDiff, the compare feature in Notepad++, or good old fc, depending on what is best for the circumstances.  At least to compare - merging isn't something I've had to do much in my time.

Is anybody here writing a file-compare tool in D?  It would be interesting to see how good a diffing algorithm we can come up with. Maybe making use of levenshteinDistanceAndPath.

Stewart.

WinMerge on Windows, kdiff on Linux.

On Tuesday, 2 April 2013 at 10:44:05 UTC, Stewart Gordon wrote:
> the compare feature in Notepad++

Would *love* scintilla-based compare tool. Where's the feature? Can't find it.

On 04/01/2013 10:18 PM, Andrei Alexandrescu wrote:
> This morning I installed Octosplit (http://goo.gl/sgNWw) on Chrome this
> morning

Really great unless I have to scroll horizontally but this will hopefully improve.

On 04/01/2013 09:53 PM, Walter Bright wrote:
> Life has gotten a lot easier for me trying to manage multiple branches
> of D since I've been using file compare/merge tools.
>
> I use winmerge for Windows, and meld for Linux. They are both free, and
> work great.
>
> What do you use?

Diffuse because it supports aligning the diffs.
http://diffuse.sourceforge.net/manual.html#file-comparison-alignment
It also understands git revisions, e.g. "diffuse -r HEAD~100 src/mars.c".
What's missing is folder comparison.

On Tuesday, 2 April 2013 at 10:44:05 UTC, Stewart Gordon wrote:
> Nowadays, CSDiff, the compare feature in Notepad++, or good old fc, depending on what is best for the circumstances.  At least to compare - merging isn't something I've had to do much in my time.
>
> Is anybody here writing a file-compare tool in D?  It would be interesting to see how good a diffing algorithm we can come up with. Maybe making use of levenshteinDistanceAndPath.

I once had to compare two very large (GBs in size) files (filesystem listings). Every diff program I tried crashed miserably. I wrote my own:
http://dump.thecybershadow.net/7558f727792723efdb159197e50d125f/uniqdiff.d

It's nothing fancy (no std.algorithm), and is greedy (it works on the assumption that once it finds one line that matches on both sides, then the diff chunk is over).