mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-06 22:45:02 +02:00
Code Issues Releases Wiki Activity

improve code to detect and solve conflicts for code removed from one version to another.

Browse Source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10168 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2009-09-20 16:20:20 +00:00
parent 7a244e1d2b
commit 97be42d31c
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
phpBB/includes/diff/diff.php
View File

@ -997,30 +997,38 @@ class diff3_op
// CASE THREE: Removed lines (orig has the to-remove line(s), but final1 has additional lines which does not need to be removed). Just remove orig from final1 and then use final1 as final2/merge // CASE THREE: Removed lines (orig has the to-remove line(s), but final1 has additional lines which does not need to be removed). Just remove orig from final1 and then use final1 as final2/merge
if (!sizeof($this->final2) && sizeof($this->orig) && sizeof($this->final1) && $this->orig !== $this->final1) if (!sizeof($this->final2) && sizeof($this->orig) && sizeof($this->final1) && $this->orig !== $this->final1)
{ {
$result = $this->_compare_conflict_seq('orig', 'final1');
if (!$result['merge_found'])
{
return;
}
// First of all, try to find the code in orig in final1. ;) // First of all, try to find the code in orig in final1. ;)
$compare_seq = sizeof($this->orig); $compare_seq = sizeof($this->orig);
$begin = -1; $begin = $end = -1;
$j = $end = 0; $j = 0;
foreach ($this->final1 as $i => $line) for ($i = 0, $size = sizeof($this->final1); $i < $size; $i++)
{ {
$line = $this->final1[$i];
if (trim($line) === trim($this->orig[$j])) if (trim($line) === trim($this->orig[$j]))
{ {
// Mark begin
if ($begin === -1) if ($begin === -1)
{ {
$begin = $i; $begin = $i;
} }
// End is always $i, the last found line
$end = $i;
if (isset($this->orig[$j+1])) if (isset($this->orig[$j+1]))
{ {
$j++; $j++;
} }
} }
if ($begin !== -1)
{
$end++;
}
} }
if ($begin !== -1 && $begin + ($compare_seq - 1) == $end) if ($begin !== -1 && $begin + ($compare_seq - 1) == $end)