I have got some kind of software in version 1.2.0
(lets call it 120
), my colleagues made changes in this software (they created custom module for this software by changing source code of software) lets call it 120-fr
version. Since then software vendor made changes in software and most recent version of software is 1.2.6
now. My task is to migrate custom module from version 1.2.0-fr
to 1.2.6
(software is made in Java btw.) and I've got original source code from 1.2.0
version.
What I made since now:
1. I've created diff between 1.2.0
and 1.2.0-fr
by:
$: diff 1.2.0/ 1.2.0-fr/ > patch-120-fr.patch
$: cat patch-120-fr.patch | wc -l
> 407
I created diff between
1.2.0
and1.2.6
:$: diff 1.2.0/ 1.2.6/ > patch-120-126.patch
$: cat patch-120-126.patch | wc -l
1265
So now (as I understand) I've got in first file changes that my colleagues made in source and in second file I've got changes between vendor versions. My question is how can I do diff between those files to append custom module to version 1.2.6
but without moving to much things from version 1.2.0? I've tried to do interdiff
but with no luck.