Wiki-merge branch
Posted by Keksmeister on 2009-07-01 14:17
I've created a wiki-merge branch to merge edits on the wiki an the svn together. Because this will be a considerable amount of work, I invite everyone who's free to join the effort.
This is how we will go about merging the wiki to svn:
The wiki-merge branch contains two folders: "wiki-snapshot" and "utf" and a "STATUS" file.
"wiki-snapshot" contains a snapshot of the wiki I retrieved today (2009-07-01). DO NOT EDIT FILES IN THE SNAPSHOT FOLDER!
"utf" contains a snapshot of current svn trunk, revision 55. This is where the changes from the wiki will be merged into.
Compare the .utf files in the "wiki-snapshot" folder with those in the "utf" folder and apply changes to the files in the "utf" folder where necessary. Once you have completed merging all the changes for a SEEN file, edit the STATUS file and change the line for the SEEN you edited from "OUT OF SYNC" to "IN SYNC (2009-07-01)". Then commit your changes.
In case there are rivaling edits on the wiki and svn I suggest you add it as "alternative Translation", like this:
Hopefully, when the merge is complete we can commit this to trunk and copy it back to the wiki (can a wiki administrator do this?), so they will finally be in sync again.
Until then I will regularly update this branch with changes from the wiki and SVN trunk, but only after this initial merge is completed.
Ultimately, of course, the parallel editing should be stopped because it makes things unnecessarily complex.
This is how we will go about merging the wiki to svn:
The wiki-merge branch contains two folders: "wiki-snapshot" and "utf" and a "STATUS" file.
"wiki-snapshot" contains a snapshot of the wiki I retrieved today (2009-07-01). DO NOT EDIT FILES IN THE SNAPSHOT FOLDER!
"utf" contains a snapshot of current svn trunk, revision 55. This is where the changes from the wiki will be merged into.
Compare the .utf files in the "wiki-snapshot" folder with those in the "utf" folder and apply changes to the files in the "utf" folder where necessary. Once you have completed merging all the changes for a SEEN file, edit the STATUS file and change the line for the SEEN you edited from "OUT OF SYNC" to "IN SYNC (2009-07-01)". Then commit your changes.
In case there are rivaling edits on the wiki and svn I suggest you add it as "alternative Translation", like this:
<0001> [... some text ...]
// alt. TL: [... some slightly different text ...] -- from wiki (or from SVN respectively)
Hopefully, when the merge is complete we can commit this to trunk and copy it back to the wiki (can a wiki administrator do this?), so they will finally be in sync again.
Until then I will regularly update this branch with changes from the wiki and SVN trunk, but only after this initial merge is completed.
Ultimately, of course, the parallel editing should be stopped because it makes things unnecessarily complex.
Home / Developer API / Tour / Get a Project - Solutions for Bug & Issue Tracking, Collaboration Tools, Subversion Hosting, Git Hosting
Clannad english localization is powered by Assembla.
5 Comments
By Keksmeister on 2009-07-01 14:21
There are 195 SEEN files to merge, it's quite a handful. ;-)
By Shizuka on 2009-07-01 15:58
I'm going to be working on an rlBabel extension for hyperlinks which will allow expanded translation notes. (as you may notice, CLANNAD's translation note (gloss) support uses a very small window. Things that need more space should be hyperlinked.)
By Shizuka on 2009-07-02 01:59
Pay attention to split lines with \strS[0] in particular.
By Keksmeister on 2009-07-08 15:55
Next I will sync this with svn trunk and also update the wiki snapshot and merge any changes that happened since 2009-07-01.
Any ideas how we could copy this merged version back to the wiki?
By Keksmeister on 2009-07-08 18:40
I'd like someone else (preferrably the project lead(ers)) to check up on it first, though. Also, it would probably be a good idea to compile a SEEN.txt file from the branch's utf files to check whether I might have broken something. ;-)
Nonetheless, I'd like to get this through quickly, as maintaining this branch will become increasingly difficult over time (because the SVN trunk, the wiki and this branch will grow further out-of-sync).