phpBB
Statistics
| Revision:
This repository is a mirror of the phpBB Git repository which is located at http://github.com/phpbb/phpbb3

Checking out phpBB from the subversion repository

In order to download the latest code from this project you need a subversion client. The URL for this repository is http://code.phpbb.com/svn/phpbb/. You will probably want to checkout the 3.0.x branch directory which contains the latest stable code using svn checkout http://code.phpbb.com/svn/phpbb/branches/phpBB-3_0_0/phpBB.

Please note that the trunk directory contains unfinished and unstable code. We highly recommend not using it, unless you know what you are doing. The code in trunk will not work most of the time.

If you want to learn more about how to use subversion then you should take a look at the Subversion Book which covers every part of subversion in great detail.

Repository (Subversion)

root / branches / phpBB-3_0_0 / phpBB / includes / diff

Name Size Revision Age Author Comment
diff.php 23.7 kB 10168 over 2 years Meik Sievertsen improve code to detect and solve conflicts for ...
engine.php 13.5 kB 10163 over 2 years Meik Sievertsen Ok, after 20+ hours i think i fixed all grave i...
renderer.php 18.4 kB 9861 over 2 years Chris Smith XHTML mistakes in the updater. #46585

Latest revisions

# Date Author Comment
10168 09/20/2009 05:20 pm Meik Sievertsen

improve code to detect and solve conflicts for code removed from one version to another.
10163 09/18/2009 07:18 pm Meik Sievertsen

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...
10160 09/17/2009 03:18 pm Meik Sievertsen

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)
10157 09/17/2009 09:14 am Meik Sievertsen

found a much better method to skip whitespace/tab changes. :)
This also solves even more unncessary conflicts - Bug #51365
10102 09/04/2009 03:50 pm Meik Sievertsen

phpBB updater now skips sole whitespace changes. This reduces the chance of conflicts tremendously.
9861 07/26/2009 06:58 pm Chris Smith

XHTML mistakes in the updater. #46585
9505 05/01/2009 11:08 am Meik Sievertsen

stupid me forgot to add a function for backwards compatibility :/
9303 01/26/2009 04:56 pm Meik Sievertsen

and once more with feeling
9254 01/13/2009 10:55 am Meik Sievertsen

TortoiseMerge seems to mess up the newlines... very very annoying bug.
9252 01/12/2009 04:58 pm Meik Sievertsen

- 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

View revisions

Also available in: Atom