It is decorated with markers that indicate conflicting regions and can be edited by hand if necessary. This is the file visible in the Cornerstone working copy browser.
Snailsvn install compare tool update#
BASE revision) at the time the last update was made before the conflict occurred. This file contains the latest version from the repository at the time the conflict occurred. This file contains the uncommitted changes made before the conflict occurred. If the tool is not listed select Add Compare Tools… and follow the same steps for installing support for compare tools, as described above.įour files are involved when resolving conflicts: Select the tool to use from the External merge tool popup menu.Resolving Conflicts with External Merge ToolsĬornerstone also provides support for using the following external merge tools to resolve conflicts: As with BASE files, the HEAD file is locked and should not be modified. Once again, this is also the order in which the files are specified to custom scripts. When comparing the working version against HEAD, the working version is treated as the original (or old) version and HEAD as the modified (or new) version in a manner consistent with Cornerstone’s integrated comparison view. The BASE file is locked before launching the external compare tool and should not be modified. When comparing BASE against the working version, BASE is treated as the original (or old) version and the working version as the modified (or new) version (the two file paths are specified in this order to custom scripts as well).Īs a result, most comparison tools will display the BASE version on the left and the working version on the right ( BBEdit and TextWrangler behave somewhat differently, displaying the newer file on the left). The following example Bash shell script uses the opendiff tool provided with macOS to compare the files specified as the script’s two arguments:ĭo shell script "/usr/bin/opendiff \"" & original_path & "\" \"" & modified_path & "\""Įnd run Installing Custom Compare ScriptsĬhoose Cornerstone > Preferences… then click General.Ĭlick the “External compare tool” pop-up menu and choose Open Scripts Folder.Ĭopy your script into the selected directory.Ĭlick the “External compare tool” pop-up menu and select your script. Custom scripts are required to take two arguments which describe the paths to the files being compared.Ĭustom scripts are executed as: /path/to/script original modified Unix Shell Scripts If you wish to use a compare tool that is not directly supported by Cornerstone, then you can also select a custom Unix shell script or AppleScript file. Select the tool to use from the External compare tool popup menu.Open the app’s preferences by selecting Cornerstone > Preferences… (key equivalent ⌘,) and activating the General pane.A check mark appears over the compare tool’s icon indicating that installation was successful.You can open the scripts folder by clicking the Open Scripts Folder button.
0 kommentar(er)
