skylook Posted April 30, 2008 Share Posted April 30, 2008 I am trying to upgrade a ipb 3.3.4 board using the 2.3.5 diff file (because that forum is moded, I can not just replace with the upgrade pack), but I found that in the diff file the 2.3.4 codes are marked with "+++" but the 2.3.5 codes are marked with "---". There are errors reported when I use the SVN to merge. Maybe that is the 2.3.5 -> 2.3.4 diff pack by mistake. So is that file wrong ? Link to comment Share on other sites More sharing options...
bfarber Posted April 30, 2008 Share Posted April 30, 2008 We do our best to provide the diff report, but can't really support. I did an SVN diff, and then removed a bunch of nonsense (i.e. we moved our ips_kernel into a separate repo and use svn:externals to pull it in, but because of this SVN saw every single file in ips_kernel as changed and the diff report was some 12MB in size). It's not the --- vs +++ (that's added vs removed code and *should* be correct...let me know if you think it's not) but probably some character mistake I made in removing the excess stuff. Link to comment Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.