Editing Talk:Clannad (section)

===Update: 2010-12-31===
As of 2010-12-15, there were
* 68 files in sync
* 38 files with differences in spacings only
* 68 files with contents updated in SVN (and possibly Wiki)
* 21 files with contents updated in Wiki only

As of 2010-12-31, there are
* 147 files in sync
* 48  files with contents updated in Wiki

("In sync" means that the contents are identical byte-for-byte, without considering the UTF-8 BOM or the end-of-file-newline)


<span style="text-decoration:line-through;">'''Possible encoding issues:''' After the merge, my rlc had trouble parsing 9 .utf files downloaded from the Wiki. My work-around was to open and re-save those files in Notepad (without other modifications). I'm not sure what causes this yet. The affected files are:</span>
* <span style="text-decoration:line-through;">All 7 of the "hacked" files: SEEN0444, SEEN1430, SEEN4421, SEEN4428, SEEN4508, SEEN6430, SEEN6800</span>
* <span style="text-decoration:line-through;">2 "spacing-differences-only" files: SEEN4424, SEEN5430</span>
<span style="text-decoration:line-through;">--[[User:Polarem|Polarem]] 13:33, 31 December 2010 (UTC)</span>
: They're gone now, without any modifications. Must have been the way I was downloading the pages. --[[User:Polarem|Polarem]] 07:01, 24 January 2011 (UTC)


'''Documentation:''' For a summary of the changes made during the merge, see the [http://www.baka-tsuki.org/project/index.php?limit=120&title=Special%3AContributions&contribs=user&target=Polarem&namespace=&year=2010&month=-1 contributions list] from 2010-12-16 to 2010-12-31. I changed the reporting style slightly after in the middle of Dec 26: Before that, only SVN edits were noted, and Wiki edits were marked as "retain"ed.

Categories:
* Text (minor, moderate, Major) -- Rough indication on the number of lines/words changed
* hack -- Resource file (.utf) numbers updated to match SVN .ke files. Backwards compatibility broken
* coding -- Control codes and other Kepago syntax
* documentation -- Comments that describe flow-control (e.g. jump to SEENxxxx line xxxx)
* comments -- Other comments, not describing flow-control
* spacings -- Reduced multiple consecutive whitespaces to a single space; Removed end-of-line whitespace

Keywords:
* retain -- Kept the old version of a line (because I thought it was better), or a deleted comment. Before Dec 26, it could also mean that the Wiki was updated.
* fix -- Corrected an error introduced by the update

Special merge types:
* Conflict merge -- Particularly difficult merges, usually where it's hard to tell if the Wiki was updated, or if SVN had undone the Wiki's edits. I tried to determine the latest version of each line by checking the timestamped diffs, but might still have accidentally undone someone's work
* Hack merge -- Contains changes under the "hack" category
* Spacings merge -- The only changes are under the "spacings" category