- #Mac visual diff tool merge how to#
- #Mac visual diff tool merge code#
- #Mac visual diff tool merge windows#
To configure Perforce to use the Diff tool :
#Mac visual diff tool merge how to#
If you are using another revision control system, consult the help for your revision control system on how to configure it for third-party comparison tools.
#Mac visual diff tool merge windows#
This example shows how to configure the Diff Tool tool on a Windows machine running the Perforce Visual Client 2016 November 01. Where file1 and file2 are the files you want to compare. You can run the Diff Tool from the command line to compare by entering the following command: In the preceding table, is the major release version of MapleSim (for example, 2016), and is your user name. Library/Frameworks/amework/Versions//bin Ĭ:\Program Files\Maple \toolbox\MapleSim\bin.X86_64_WINDOWSĬ:\Program Files\Maple \toolbox\MapleSim\bin.win
See the following table for the name and default location of the Diff Tool. The name and location of the Diff Tool tool depends on your operating system and architecture. For example, changes to parameters will always appear even when all of the filter options have been cleared. Note that some information cannot be filtered. For each connection, the component names and ports affected by the change are given in the connect statement. Model diagram changes (for example, moving a component)ĭisplay Additions and Removals: Instances of components and shared subsystems that have been added or deleted from the model.ĭisplay Attachment changes: Differences related to files attached to the model or to components.ĭisplay Connection changes: Any changes made to connections between components in the Model workspace.
#Mac visual diff tool merge code#
The following describes the type of information associated with the filters in the Controls area.ĭisplay Annotation changes: Changes made to Modelica annotations in the Modelica source code for the model. Clear an option to hide the changes associated with an option. The Controls area contains filtering options for the information displayed. The output displays the name and versions of the file below the Controls section.ĭifferences are shown after the file information and are color coded according to the type of change: addition (green), deletion (red), modification (orange).įor instances where a parameter value has changed, the value on the left is the setting for the first version, and the value on the right is the setting for the second (bottom) version. html file that opens automatically in your default browser (see the following figure).
The output from the Diff Tool tool is an. You can use the Diff Tool tool to compare the following file formats:įor more information on these file formats, see Version Controlled MapleSim Model File Format and Version Controlled Library File Format. The Diff Tool tool is a separate executable that shows the differences between two versions of a file stored in your revision control system (if your revision control system supports third-party comparison tools). Example: Configuring Perforce for Windows
0 kommentar(er)
