History | View | Annotate | Download (23.7 kB)
commit adfa1656fb9d8b5bb601af1d7a6720884954d87aMerge: bd579c8 af5b9a9Author: Nils Adermann <naderman@naderman.de>Date: Mon Dec 13 16:35:55 2010 +0100
Merge branch 'ticket/igorw/9556' into develop
Copy 3.0.x branch to trunk
improve code to detect and solve conflicts for code removed from one version to another.
Ok, after 20+ hours i think i fixed all grave issues with the updater- smaller memory footprint- better checks for already updated files- even less conflicts- fixed automatic conflict resolving after successful merges- no more conflicts for $Id$ changes...
phpBB updater now solves common conflicts on it's own. This further reduces the chance of conflicts.(tested with some heavily modified files who previously generated a lot of conflicts)
stupid me forgot to add a function for backwards compatibility :/
and once more with feeling
TortoiseMerge seems to mess up the newlines... very very annoying bug.
- Allow download of conflicting file for later reference in automatic updater- Default difference view is now 'inline' instead of 'side by side'- Added new option for merging differences to conflicting files in automatic updater
update diff engine to Text_Diff 1.1.0
5.3 compatibility.
some diff engine updates (only minor, but will hopefully not break anything)
Hiding everywhere little buggers, eh?
This commit was manufactured by cvs2svn to create branch 'phpBB-3_0_0'.
dumdidum... sorry. ;)
- two new packages... diff and utf- only 60 chars for topic title if new post (please see changelog for explanation)- change utf8_wordwrap (had some bugs david and nils spotted - was not really functional, sorry for this. :D)
updates for the updater and the diff engine.- this update also includes an important change for including the diff engine, since we may need to include an updated engine before updating. This basically means that for a future update (B4 to another version) requires copying the new diff files first... the new include method should prevent this needed handwork for later versions then.
better regex
begin working on getting this thing a bit faster. I need to finish the other calls, this commit actually will break the diff engine and the updater. The speed increase noticed is from 89 seconds to 22 seconds as well as saving a lot of memory.
adjust some comments to work with phpdocumentor. :)
some changes/fixes
Thanks to the GPL we are able to use the pear package text_diff - now splitted into the diff classes, the renderer and the engine
