#Merge released versions of Prohits with our implementation
Introduction
Prohits is developed by mshri and periodically they release new versions of the code. In order to merge all their changes into our svn version of Prohits there are a few steps you need to take to capture all their updates and resolve potential conflict with concurrent development.
Merging two versions
- make sure to store original (unversioned copy) of each version of Prohits released by mshri.
- Below example is attempting to merge version 1.0.5 into version 1.04
- Steps:
- #diff the old version and the new version (include new files, recursive, unified output)
- diff -Nrup Prohits_v1.0.4/ Prohits_v1.0.5/ > v104_diff_v105.patch
- #change into the versioned copy of Prohits
- #apply the patch to the versioned tree.
- patch -p1 <../../v104_diff_v105.patch
- Go through changes to the svn version, make sure their are no conflicts.
- Commit updated version