Re: scripts for merging local changes

2015-05-24 Thread James McCoy
On Mon, May 25, 2015 at 03:45:38AM +0100, peter green wrote: > I just hacked together some scripts (the code is in two parts, the overall > control code is in bash script while the changelog processing is in python) > to deal with merging local changes (provided in the form of a debdiff) with > a n

scripts for merging local changes

2015-05-24 Thread peter green
I just hacked together some scripts (the code is in two parts, the overall control code is in bash script while the changelog processing is in python) to deal with merging local changes (provided in the form of a debdiff) with a new version from Debian (provided in the form of a dsc) I still n