The Wiert Corner – irregular stream of stuff

Jeroen W. Pluimers on .NET, C#, Delphi, databases, and personal interests

  • My badges

  • Twitter Updates

  • My Flickr Stream

  • Pages

  • All categories

  • Enter your email address to subscribe to this blog and receive notifications of new posts by email.

    Join 2,154 other followers

Archive for the ‘Beyond Compare’ Category

Plastic SCM compare versus Beyond Compare; guess which screenshot I like most

Posted by jpluimers on 2018/08/20

Same difference; two tools.

Plastic SCM compare: lots of clutter

Beyond Compare: just the things that are different.

–jeroen

Posted in Beyond Compare, Development, PlasticSCM, Power User, Source Code Management | 3 Comments »

Beyond compare – prefix any registry key comparisons with reg:\\

Posted by jpluimers on 2018/08/03

When you start with a blank registry comparison, then you need to compare keys copied from RegEdit with reg:\

For instance, when fixing [WayBack] Delphi fails to start after Windows did some “Program Compatibility Assistant” magic to it when BDS.exe crashed because the compiler ran out of memory:… – Jeroen Wiert Pluimers – Google+ I compared these:

reg:\\HKEY_CURRENT_USER\Software\Embarcadero\BDS

reg:\\HKEY_CURRENT_USER\Software\Embarcadero\JeroenProfile

Via: [WayBackSpecs

Note: Beyond compare registry settings are in:

  • HKEY_CURRENT_USER\Software\Scooter Software\Beyond Compare 4
  • HKEY_LOCAL_MACHINE\SOFTWARE\Scooter Software\Beyond Compare
  • HKEY_LOCAL_MACHINE\SOFTWARE\Scooter Software\Beyond Compare 4
  • HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Scooter Software\Beyond Compare
  • HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Scooter Software\Beyond Compare 4

jeroen Not sure where the CacheID entry under HKLM is for.

Posted in Beyond Compare, Power User | Leave a Comment »

Diffing binary files in PlasticSCM through Beyond Compare

Posted by jpluimers on 2018/08/02

The diff engine in PlasticSCM is nice in appearance, but it lacks a lot of features for file types that Beyond Compare handles out of the box.

For instance, .RES files cannot be diffed:

---------------------------
Error
---------------------------
Unsupported file types for binary diff. Only images are supported (JPEG, PNG, GIF, BMP)
---------------------------
OK   
---------------------------

Read the rest of this entry »

Posted in Beyond Compare, Development, PlasticSCM, Power User, Source Code Management | 2 Comments »

If Beyond Compare indicates “editing disabled” after starting from SourceTree, then your integration is wrong.

Posted by jpluimers on 2017/10/16

SourceTree 2.1 still doesn't recognise that Beyond Compare is installed.

SourceTree 2.1 still doesn’t recognise that Beyond Compare is installed.

I noticed that on my Mac, Beyond Compare wasn’t able to edit diffed files when it had been started from SourceTree. This struck me as odd since on Windows this worked fine. So I did a bit of digging and found out both SourceTee and I screwed up:

Editing Disabled

Luckily [WayBackZoë Peterson (lead developer on Beyond Compare and formerly Turbo Power Abbrevia project admin) had answered this before, and all these show “Editing disabled” in the user-interface:

Beyond Compare will disable editing of a file any of the following reasons:

  • It’s one of the input files in a 3-way merge
  • The comparison was cancelled
  • The comparison encountered an error (corrupt file, invalid character encoding, out of memory, gamma rays, etc)
  • The file format’s conversion settings don’t support converting back to the original format (MS Word, PDF)
  • The file is on a read-only “filesystem” (7zip/RAR/CHM archives, CD/DVD-ROMs)
  • A file or parent folder had editing explicitly disabled by the user in the session settings or using the /ro command line switches
  • The viewer itself doesn’t support editing (eg, Hex Compare)

Source: [WayBackversion control – Beyond Compare 3 editing disabled – Stack Overflow

So the last instruction should be:

Set both Visual Diff Tool and Merge Tool to Other, then set both the Diff Command and Merge Command to the value you obtained above (in my case /usr/local/bin/bcomp) and these arguments:

  1. Diff Command Arguments
    "$LOCAL" "$REMOTE"
  2. Merge Command Arguments
    "$LOCAL" "$REMOTE" "$BASE" "$MERGED"

Note that somewhere during 2.2, SourceTree has added Beyond Compare integration and fixed some of the issues, but there are still issues left:

No Editing Disabled

There is only one occasion where the UI does not show “Editing Disabled”, but where you cannot edit the file itself (you can only edit the current line in the line diff view at the bottom of the UI). Zoë mentioned that too:

Also, the Full Edit (F2) toggle in the Text Compare View menu switches between inline editing and line-based mode. If it’s disabled you can copy/delete whole lines and type in the line details edits at the bottom of the window, but the main windows won’t have a cursor, typing is disabled, and it will always select whole lines. Unlike the above items, this doesn’t show “Editing Disabled” in the status bar.

Source: [WayBackversion control – Beyond Compare 3 editing disabled – Stack Overflow

By default this setting is bound to the F2 key on Windows, so if you accidentally press that when Beyond Compare is active, you might be in for a surprise.

Screen shots:

Read the rest of this entry »

Posted in Beyond Compare, Power User | Leave a Comment »

Using BC4 OSX with Version Control Systems

Posted by jpluimers on 2017/08/10

A great thread about Using BC4 OSX with Version Control Systems, -Tools and IDEs.

Some highlights:

–jeroen

Posted in Beyond Compare, CVS, Development, DVCS - Distributed Version Control, git, Mercurial/Hg, Power User, Software Development, Source Code Management, SourceTree, Subversion/SVN, TFS (Team Foundation System) | Leave a Comment »

 
%d bloggers like this: