Beyond Compare: Difference between revisions
m →Rules |
mNo edit summary |
||
| Line 16: | Line 16: | ||
# Explicit* should now appear in the original dialog's Grammar Elements list. | # Explicit* should now appear in the original dialog's Grammar Elements list. | ||
# Uncheck it, then change the combobox at the bottom of the dialog from Use for this view only to Update session defaults. | # Uncheck it, then change the combobox at the bottom of the dialog from Use for this view only to Update session defaults. | ||
== Git Integration == | |||
[[File:SourceTree-BC.png|thumb|right| 450px]] | |||
First of all make Beyond Compare reachable from the command line using the menu-option {{FormFCTW|8|blue|bold|Beyond Compare}} → {{FormFCTW|8|blue|bold|Install Command Line Tools}} which creates a symbolic link: | |||
<pre> | |||
/usr/local/bin/bcomp | |||
</pre> | |||
=== SourceTree Integration === | |||
Open SourceTree and go to menu option {{FormFCTW|8|blue|bold|SourceTree}} → {{FormFCTW|8|blue|bold|Preferences}} and click on the {{FormFCTW|8|blue|bold|Diff}} icon on top of the window. | |||
<br>Now fill the creates symbolic link into the <i>External Diff / Merge</i> as show on the right. Please note you have to change all input fields. | |||
=== Git CLI === | |||
The Git Command Line Interface (Terminal usage) has the following commands in case of an collision: | |||
<pre> | |||
# To See what is configured | |||
$ git config --global --list | |||
# Diff - Sets the requested Diff Tool | |||
$ git config --global diff.tool bc3 | |||
# To launch a diff using Beyond Compare | |||
$ git difftool file.ext | |||
</pre> | |||
== See also == | == See also == | ||
<span class="editsection">[[#content|top]]</span> | <span class="editsection">[[#content|top]]</span> | ||
* [https://www.scootersoftware.com/support.php?zz=kb_vcs_osx#:~:text=5%20or%20newer)-,Launch%20Beyond%20Compare%2C%20go%20to%20the%20Beyond%20Compare%20menu%20and,drop%2Ddown%20to%20Beyond%20Compare. BC Technical Support], Using Beyond Compare with Version Control Systems (macOS). | |||
Beyond Compare can be configured as the external difference utility in many popular VCS applications. | |||
== Reference == | == Reference == | ||
Revision as of 10:00, 16 September 2021
Beyond Compare is a data comparison utility.
Aside from comparing files, the program is capable of doing side-by-side comparison of directories, FTP and SFTP directories, Dropbox directories, Amazon S3 directories, and archives.
It is available for Windows, Mac OS, and Linux operating systems.
A strength of Beyond Compare is that it can be configured as difftool and mergetool of version control systems, such as git. [1].
Rules
Minor diffs
Sometimes you don't want to see minor differences [2].
- Load a pair of DFM files showing the difference.
- Click the Session Settings button (aka Rules w/ umpire icon) or use the Session ⇨ Session Settings menu item.
- Switch to the Importance tab then click the Edit Grammar... button to open a second dialog.
- Click the New... button below the top listbox to open a third dialog.
- Change the Element Name option to something like Explicit*, change the Text Matching to Explicit(Left|Top|Width|Height) = \d+ and check the Match character case and Regular expression checkboxes, then click Ok, then click Ok again in the second dialog.
- Explicit* should now appear in the original dialog's Grammar Elements list.
- Uncheck it, then change the combobox at the bottom of the dialog from Use for this view only to Update session defaults.
Git Integration
First of all make Beyond Compare reachable from the command line using the menu-option Beyond Compare → Install Command Line Tools which creates a symbolic link:
/usr/local/bin/bcomp
SourceTree Integration
Open SourceTree and go to menu option SourceTree → Preferences and click on the Diff icon on top of the window.
Now fill the creates symbolic link into the External Diff / Merge as show on the right. Please note you have to change all input fields.
Git CLI
The Git Command Line Interface (Terminal usage) has the following commands in case of an collision:
# To See what is configured $ git config --global --list # Diff - Sets the requested Diff Tool $ git config --global diff.tool bc3 # To launch a diff using Beyond Compare $ git difftool file.ext
See also
- BC Technical Support, Using Beyond Compare with Version Control Systems (macOS).
Beyond Compare can be configured as the external difference utility in many popular VCS applications.
Reference
- ↑ Wikipedia], Beyond Compare.
- ↑ Stack Overflow, How do i make BC ignore certain differences while comparing.