On 01.04.2013 22:36, Nick Sabalausky wrote:
> On Mon, 01 Apr 2013 12:53:23 -0700
> 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?
>
> I've been using Beyond Compare <http://www.scootersoftware.com/> for
> over ten years now. Can't live without it, and wouldn't want to
> anyway ;) Heck, I use it a lot even for non-development purposes.
>

I agree, Beyond Compare is the best I know (though I didn't really searched further after buying it).

Trying to do some pull request reviews I was pretty turned down by the very small context visible in the diffs on github. So I wrote a little program to help getting a visual side-by-side diff:

https://github.com/rainers/visuald/blob/master/tools/cmppull.d

Assuming that you have copied the link to the pull request page to the clipboard, it

- extracts the link form the clipboard (or from the command line)
- downloads that page
- extracts information about the author, branch and number of commits
- fetches the changes
- starts the TortoiseGit "Diff to previous version" dialog and fills some text fields with appropriate entries

This allows to review the pull request using your favorite diff tool. The implementation is currently very Windows-specific, but it should not be too hard to adopt it to other systems or tools.

Rainer

PS: the win32 curl libraries don't seem to support https. Is this correct or do they need some special setup?
PPS: the win64 curl libraries are not available for download. Is this an oversight?

On Wednesday, 3 April 2013 at 07:32:27 UTC, Rainer Schuetze wrote:
> PS: the win32 curl libraries don't seem to support https. Is this correct or do they need some special setup?

http://d.puremagic.com/issues/show_bug.cgi?id=9737

SSL usage example:
-----
auto http = HTTP();

// Set the CA certificate bundle file to use for SSL peer verification
// To dowload this file (or generate it yourself) see
http://curl.haxx.se/docs/caextract.html
//  or D\dmd2\windows\mk-ca-bundle.vbs
// For more information about SSL peer verification see
http://curl.haxx.se/docs/sslcerts.html
http.caInfo("cacert.pem");

In my experience p4merge from Perforce can resolve more conflicts automatically that many of the other tools I've tried.

/Jonas

On 02/04/2013 19:32, Kagamin wrote:
> 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.

It's a plugin - I think whether it comes pre-installed depends on which Notepad++ distribution you have.  But for me, it's Plugins -> Compare.

If you don't have it, I suggest you start here:
http://sourceforge.net/apps/mediawiki/notepad-plus/index.php?title=Plugin_Central

Stewart.

-- 
My email address is valid but not my primary mailbox and not checked regularly.  Please keep replies on the 'group where everybody may benefit.

On Monday, 1 April 2013 at 20:18:36 UTC, Andrei Alexandrescu wrote:
> On 4/1/13 3: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?
>
> It's a good discussion. Love meld but OSX installation is tenuous so I gave up on it. This morning I installed Octosplit (http://goo.gl/sgNWw) on Chrome this morning, it took seconds and it made diff viewing a lot better.
>
> Andrei

Just started using Octosplit and I have to say it's really nice.

It is a little slow though on really big diffs, I tested it on a recent pull of mine to druntime (>2500 lines changed) it takes a few seconds for the tick box to appear, then the page hangs for a few more seconds once I click it.

Stil, hardly long to wait in the general scheme of things, especially compared to opening some applications.

On Monday, 1 April 2013 at 19:53:23 UTC, 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?

I am surprised there is still no "smart" diff/merge tool, by which I mean one which understands the syntax of languages and or detects syntaxic or semantic errors in the merged file, or better yet, compares code based on the syntax.

Am 01.04.2013 21:53, schrieb Walter Bright:
> 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?
>

i've used several open source, freeware and commercial tools over the years but nothing can beat araxis merge (commercial) in any way - it is by far the best diff/merge tool available - good in text, 3-way, xml and binary diff/merge, in speed and visual representation of moves etc.

On 2013-04-01 14: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?

windows only:
i use the very powerful 'Total Commander' file manager all the time. the built-in file compare is good enough for me. it works for text and binary, allows editing and 2way copying/syncing, options are case in/sensitive, ignore multiple spaces /not.

TC is shareware but can be used/tested for free - just a nag window at startup. it is much more than a file manager, it is also ftp client, has a deep/in-file search, viewer for text and media files, dir/file sync, built-in un/zip lets you browse through archives as if regular folders, many features more and plug-ins galore...

/det

On 4/2/13 3: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?

Under Windows I use TortoiseMerge, part of TortoiseGit/TortoiseSVN but also works standalone.
Under OSX/linux I use git diff --color --word-diff :S

L.