Debian uses the dpkg package system, which manages .deb packages. But since this is a pretty basic tool, this Linux distribution ships with several front-ends. Particularly, we’ll be using apt for our needs.
Supported versions: We currently support Debian 6, Debian 8 and Ubuntu 14.04. However, the Debian 6 repository is compatible with Debian 7 and Ubuntu 12.04 as well.
Warning! (2016-02-08) We’ve updated our bundled Mono version, starting with semanticmerge 126.96.36.199. Our packages will now require Mono 4.3 as a dependency, which might cause conflicts
during package upgrade. To upgrade your Plastic SCM Linux installation, check the following guide:
Adding the repository
To make Debian recognize our repository, we have to edit the sources file for apt, which can be found under /etc/apt/sources.list.
Each line of this file contains a URL pointing to a particular repository, complemented with some metadata. You'll need to replace the string <dist_id> with the distribution you'd like to use (Debian_6.0, Debian_8.1 or Ubuntu_14.04)!
So, for our public repository, you just need to add the following lines with your favorite text editor (remember that you'll need administrator access since this is a system file):
# PlasticSCM infrastructure repository (needed to install mono)
deb https://www.plasticscm.com/plasticrepo/plasticscm-common/<dist_id>/ ./
# SemanticMerge repository
deb https://www.semanticmerge.com/semanticrepo/<dist_id>/ ./
The apt system verifies the repository integrity using the public key from the repository as well as the checksum of some index files.
That means that you’ll have to add our public key to apt.
First, you must download the key file:
wget https://www.plasticscm.com/plasticrepo/plasticscm-common/<dist_id>/Release.key -O - | apt-key add -
wget https://www.semanticmerge.com/semanticrepo/<dist_id>/Release.key -O - | apt-key add -
Since our server is using HTTPS to secure its communications, you'll need to install the necessary apt add-on.:
apt-get install apt-transport-https
After that, you have to reload the apt cache by executing the following command:
At this point you are only one step away from having SemanticMerge installed on your system!
You just have to execute the following line:
# apt-get install semanticmerge
Once the process is complete, you’ll be able to use SemanticMerge with the default configuration options.
First steps - Check the samples directory
We've included a directory with some Semantic cases.
Check the /opt/semanticmerge/samples directory to get familiar with the tool and its capabilities. Inside the subdirectories you will find several merge scenarios that you will be able to launch using the included .sh script.
Remember we have configured the scripts to use Kdiff3 to perform text based merge, so make sure you have it installed.
You can execute the following line on your terminal to run a merge case with a divergent move conflict:
For further understanding of how to use the SemanticMerge command line parameters, please review the contents of the sample script.
Now let's merge!