Nils Adermann 47ce0f2a93 Update: Store expected resulting file contents in cache and do not suggest further merges if the contents match, also fixes infinite merge loop [Bug #54075] ...

If you were trying to update from 3.0.5 to 3.0.6 but were presented with a dialogue
suggesting to merge the same file over and over take the install/install_update.php
from 3.0.7-RC2 or current svn, and replace your 3.0.5 one with it. It works fine in
3.0.5.


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10528 89ea8834-ac86-4346-8a33-228a782c2dd0

2010-02-23 23:35:48 +00:00

build

Fixing the code changes from diff building script: When an edit was detected as replacing an empty line by diff it would get dropped from the code changes

2010-02-23 15:07:58 +00:00

phpBB

Update: Store expected resulting file contents in cache and do not suggest further merges if the contents match, also fixes infinite merge loop [Bug #54075]

2010-02-23 23:35:48 +00:00

Description

No description provided

192 MiB

Languages

PHP 86.9%

HTML 8.5%

JavaScript 2.7%

CSS 1.6%

Shell 0.2%