Replaced

This table has been replaced with a dynamic script that shows the current status of comparisons between rel-1-2 and main branches.

[http://hazeltonsec-17.cmsd.bc.ca/cgi-bin/kohadiff CVS Release Branch Comparison]

Old Differences Table

C4/InterfaceCDK.pm Lines: 3Main 1.2Branch 1.1.1.1.2.1use Cdk is commented out in rel-1-2?
C4/Stats.pm Lines: 5Main 1.4Branch 1.3.2.2Merged. 1.3.2.3 is identical to 1.4
C4/Print.pm Lines: 7Main 1.5Branch 1.3.2.1Merged. 1.3.2.2 is identical to 1.5
testKoha.pl Lines: 9Main 1.5Branch 1.1.2.7Main has additional Catalogue.t test
modbibitem.pl Lines: 15Main 1.8Branch 1.4.2.1main calls deletebiblioitem.pl, rel-1-2 calls delbibitem.pl main also has an additional URL input
admin/systempreferences.pl Lines: 40Main 1.3Branch 1.1No changes in rel-1-2
updater/updatedatabase2.pl Lines: 59Main 1.2Branch 1.1.2.1merged by Paul
acqui/addorder.pl Lines: 65Main 1.7Branch 1.3.2.1Merged by Paul
database.mysql Lines: 65Main 1.7Branch 1.2.2.6Marged by paul
acqui/newbiblio.pl Lines: 68Main 1.4Branch 1.2.2.2Merged by paul
acqui/finishreceive.pl Lines: 71Main 1.5Branch 1.1.1.1.2.1Changes in both branches
acqui.simple/marcimport.pl Lines: 91Main 1.11Branch 1.6.2.23Lots of changes in both branches!
C4/Input.pm Lines: 93Main 1.1.1.1Branch 1.1.1.1.2.2Merged. 1.2 is identical to 1.1.1.1.2.2
memberentry.pl Lines: 104Main 1.6Branch 1.6.2.1No changes in main
updater/updatedatabase Lines: 121Main 1.10Branch 1.4.2.6Several Changes in both branches!
updatebiblio.pl Lines: 127Main 1.2Branch 1.1.1.1.2.1Merged by paul
updatebibitem.pl Lines: 137Main 1.6Branch 1.4.2.1Merged by paul
search.pl Lines: 167Main 1.9Branch 1.6.2.1Changes in both branches
acqui/newbasket2.pl Lines: 180Main 1.2Branch 1.1.1.1.2.2Nothing to merge : main branch has new features from Chris
INSTALL Lines: 181Main 1.2Branch 1.1.2.7Changes in both branches
modbib.pl Lines: 186Main 1.4Branch 1.1.1.1.2.1Merged by Paul
moredetail.pl Lines: 295Main 1.7Branch 1.4.2.1Nothing to merge (main branch uses templates)|| ||C4/Reserves2.pm ||Lines: 314||Main 1.7||Branch 1.5.2.2||Merged by Paul|| ||C4/Output.pm ||Lines: 330||Main 1.10||Branch 1.6.2.8||Several changes in both branches|| ||detail.pl ||Lines: 333||Main 1.9||Branch 1.3||No changes in rel-1-2|| ||circ/branchtransfers.pl ||Lines: 337||Main 1.9||Branch 1.3||No changes in rel-1-2|| ||request.pl ||Lines: 364||Main 1.3||Branch 1.2.2.2||Small merge. Most diffs due to finlay rewritting the script|| ||acqui.simple/addbooks.pl ||Lines: 510||Main 1.9||Branch 1.5.2.1||Changes in both branches|| ||installer.pl ||Lines: 558||Main 1.2||Branch 1.2.2.16||No changes in main|| ||admin/branches.pl ||Lines: 648||Main 1.2||Branch 1.1||No changes in rel-1-2|| ||marc/marcschema.sql ||Lines: 649||Main 1.14||Branch 1.2||No changes in rel-1-2|| ||C4/Search.pm ||Lines: 805||Main 1.29||Branch 1.18.2.3||Merged by Paul|| ||C4/Circulation/Circ2.pm ||Lines: 931||Main 1.29||Branch 1.21.2.1||Merged changes from 1.21.2.1 into 1.29, version in rel-1-2 is still quite different steve|| ||C4/Acquisitions.pm ||Lines: 979||Main 1.18||Branch 1.5.2.10||Merged by Paul.|| ||ChangeLog ||Lines: 1256||Main 1.1||Branch 1.1.2.5||No changes in main|| ||circ/circulation.pl ||Lines: 1386||Main 1.31||Branch 1.23||No changes in rel-1-2|| ||C4/Catalogue.pm ||Lines: 1748||Main 1.19||Branch 1.11.2.1||Merged by Paul.|| ||C4/Biblio.pm ||Lines: 1921||Main 1.1||Branch 1.1.2.1||No changes in main. Merged by Paul''.
 
cvsmerge.txt · Last modified: 2006/04/04 09:23 (external edit)
 
Except where otherwise noted, content on this wiki is licensed under the following license:CC Attribution-Noncommercial-Share Alike 3.0 Unported
Recent changes RSS feed Donate Powered by PHP Valid XHTML 1.0 Valid CSS Driven by DokuWiki