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

    20140508-Delphi-2007--Project-Options--Cannot-Edit-Application-Title-HelpFile-Icon-Theming20140430-Fiddler-Filter-Actions-Button-Run-Filterset-now20140424-VMware-Fusion-6.0.3.-no-reclaimable
    More Photos

  • Pages

  • All categories

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

    Join 1,365 other followers

Archive for the ‘Beyond Compare’ Category

« Previous Entries

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:

Luckily [WayBack] Zoë Peterson (lead developer on Beyond Compare and formerly Turbo Power Abbrevia project admin) had answered this before:

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: [WayBack] version 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:

–jeroen

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 »

Beyond Compare 4.1.7.21529 – AUGUST 19, 2016

Posted by jpluimers on 2016/08/22

via Download Beyond Compare I found out about this new update:

4.1.7.21529 – AUGUST 19, 2016

Notable Changes

  • Text Merge output files will now be written using file format external conversion settings.
  • Various fixes and improvements.

Archives

  • Upgraded 7-zip libraries to 16.02 to fix code execution vulnerability in UDF (.img, .iso) decoder (CVE-2016-2334 and CVE-2016-2335).
  • Windows: Added support for PKZip v1 legacy compression algorithms (Implode, Reduce, Shrink).

Cloud Services

  • Fixed support for Unicode paths and filenames on SharePoint WebDAV servers.
  • Fixed support for connecting to Amazon S3 buckets in the eu-west-1 region that were created in 2013 and earlier.
  • Fixed resource leak when uploading/downloading from Microsoft OneDrive.
  • Windows: “Open With” for WebDAV profiles now passes http:// URLs to the requested application instead of BC-specific profile: ones.
  • Improved error message if an S3 bucket is stored in an unrecognized AWS region.
  • Fixed loading WebDAV folder listings that include empty getcontentlength entries.

Command Line

  • Fixed /fileviewer= switch to use fixed English phrases instead of translated strings.

File Formats

  • OS X/Linux: Fixed importing file formats with external helper executables.
  • Fixed loading .docx files that have been modified using MiniZip.

File Views

  • “Save File Using Profile” now handles “Editing disabled” just like “Save File on File System As” does.
  • Changed button caption in “Save Changes?” confirmation dialog from “Save None” to “Discard All”.

Installer

  • .msi packages now use SHA-256 code signing signatures instead of SHA-1 ones.

Misc

  • Fixed support for scrolling using laptops/tablets with precision touchpads (.e.g, Surface Pro).
  • OS X: Fixed support for Beyond Compare “Services” menu extensions in apps other than Finder.
  • Added Japanese as an official language.
  • Time limited license keys now show a warning on the Home view when close to the expiration, and show the expiration date in the About dialog.

Options

  • Improved appearance of Options dialog and Home view for themes with dark backgrounds.

Reports

  • Fixed Picture Compare Report to use printer DPI instead of screen DPI.
  • Fixed Picture Compare Report handling of empty comparison.
  • Fixed plain text output of right justified text.
  • Fixed plain text output handling of gap lines.
  • Fixed Table Compare plain text output of interleaved headers.

Table Compare

  • Fixed performance regression introduced in 4.1.4.

Text Views

  • Windows: Fixed displaying emoji characters when “Enable font linking in editors” is enabled.
  • Linux: Fixed slow performance when long lines are visible.

Text Merge

  • Output files will now be written using file format external conversion settings.

Crashes

  • Windows: Fixed crash when opening a file on 64-bit Windows.
  • Windows: Fixed crash when opening Options dialog to Tweaks panel while DisableCheckForUpdates registry tweak is active.

–jeroen

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

Beyond Compare v 4.1.4 will fix the leap day crash of last monday when accessing cloud service

Posted by jpluimers on 2016/03/05

I was on the road last monday, so I missed this crash, but the good news is that Beyond Compare Technical Support indicates the upcoming v 4.1.4 will fix that for the future.

Cases like these are hard to find and fix a priori as you cannot force the cloud services to run faking a certain date…

Update (somehow my browser cache didn’t see this page when posting): the update was already out; see the change log at Download Beyond Compare which lists a lot of nice other things as well (including a way to force 32-bit installation on x64 windows versions when some of your other tooling cannot cope with x64 DLLs).

–jeroen

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

Compare Registry Settings – Beyond Compare – @ScooterSoftware

Posted by jpluimers on 2016/01/15

I think that Compare Registry Settings is one of the most unknown features of Beyond Compare.

So if you are a Windows that fights with the Registry every now and then, this feature is for you.

Note it is in the Windows Pro Edition only: one more reason to buy a license (:

It has been there since Beyond Compare version 3.2, and for either side of the comparison supports:

  • Your live registry
  • The registry on a remote computer
  • A .reg export file (locally or on an ftp server)

Use it to compare your registry against a backup, copy settings between PCs, and much more.

Note that comparing full registries can be slow, especially for remote registries as the registry transfer protocol of Windows is a bit chatty for the many small requests that Beyond Compare has to do.

The 2.5 minute introduction video is much better than the screenshot below, so go and watch it (:

–jeroen

via: Download Beyond Compare.

Read the rest of this entry »

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

« Previous Entries
 
%d bloggers like this: