[Koha-devel] differences between 1.2 and main branches

[paul POULAIN]

Hi,

I tried to see the differences between 1.2 and main branch...
Something like :
diff -r -b -B --exclude=*.*~ --exclude=*CVS* --exclude=Biblio.pm 
--exclude=ChangeLog --exclude=acqui.simple --exclude=admin ~/koha.dev 
~/koha.v1.2 |grep -v "< #" - |grep -v "> #" - >~/diff.txt

(the --exclude are for files that are differents and should stay as it, 
both grep are to drop comments)

Results is a file being 16652 line long !!!!
About 30% of the differences are minors (spaces, indents, cr...)
an other 15-20% seems to be predictible/normal diffs (for example, 
functions in main branch that is not in in 1.2)

So, there is still around 8 000 lines that are in 1.2 and should be in 
main branch too...
What do we do ?
4 months ago (july 4th), i ended a (nightmare) merge, and warned to be 
very carefull with the differences between them.
It seems i haven't been heard...
So, do who want to merge everything again ?
--
Paul