aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/diff/engine.php
Commit message (Collapse)AuthorAgeFilesLines
* Ok, after 20+ hours i think i fixed all grave issues with the updaterMeik Sievertsen2009-09-181-2/+15
| | | | | | | | | | | | | - 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 - fixed skip_whitespace_changes bug where code blocks were added to diff_op_add whereby the previous or next diff_op_copy already had the change - correctly display merged files in diff view (previously it happened that the old file was used for comparision, although the new file was different/newer/merged) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10163 89ea8834-ac86-4346-8a33-228a782c2dd0
* found a much better method to skip whitespace/tab changes. :)Meik Sievertsen2009-09-171-19/+8
| | | | | | This also solves even more unncessary conflicts - Bug #51365 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10157 89ea8834-ac86-4346-8a33-228a782c2dd0
* phpBB updater now skips sole whitespace changes. This reduces the chance of ↵Meik Sievertsen2009-09-041-0/+16
| | | | | | conflicts tremendously. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10102 89ea8834-ac86-4346-8a33-228a782c2dd0
* update diff engine to Text_Diff 1.1.0Meik Sievertsen2009-01-121-1/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9251 89ea8834-ac86-4346-8a33-228a782c2dd0
* 5.3 compatibility.Marek A. R2008-08-161-4/+4
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8765 89ea8834-ac86-4346-8a33-228a782c2dd0
* some diff engine updates (only minor, but will hopefully not break anything)Meik Sievertsen2008-07-281-9/+11
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8692 89ea8834-ac86-4346-8a33-228a782c2dd0
* dumdidum... sorry. ;)Meik Sievertsen2007-10-051-3/+4
| | | | git-svn-id: file:///svn/phpbb/trunk@8147 89ea8834-ac86-4346-8a33-228a782c2dd0
* - two new packages... diff and utfMeik Sievertsen2007-08-161-2/+2
| | | | | | | | - 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) git-svn-id: file:///svn/phpbb/trunk@8034 89ea8834-ac86-4346-8a33-228a782c2dd0
* - some bugfixesMeik Sievertsen2007-01-091-0/+1
| | | | | | | - bugfixes for the convertor (typecasting for example was totally broken) git-svn-id: file:///svn/phpbb/trunk@6865 89ea8834-ac86-4346-8a33-228a782c2dd0
* updates for the updater and the diff engine.Meik Sievertsen2006-11-291-3/+24
| | | | | | | - 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. git-svn-id: file:///svn/phpbb/trunk@6695 89ea8834-ac86-4346-8a33-228a782c2dd0
* begin working on getting this thing a bit faster. I need to finish the other ↵Meik Sievertsen2006-11-281-2/+3
| | | | | | 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. git-svn-id: file:///svn/phpbb/trunk@6692 89ea8834-ac86-4346-8a33-228a782c2dd0
* adjust some comments to work with phpdocumentor. :)Meik Sievertsen2006-11-171-4/+2
| | | | git-svn-id: file:///svn/phpbb/trunk@6595 89ea8834-ac86-4346-8a33-228a782c2dd0
* Thanks to the GPL we are able to use the pear package text_diff - now ↵Meik Sievertsen2006-08-221-0/+512
splitted into the diff classes, the renderer and the engine git-svn-id: file:///svn/phpbb/trunk@6313 89ea8834-ac86-4346-8a33-228a782c2dd0