[Server-devel] TinyMCE in Moodle

[Martin Langhoff]

On Fri, Oct 3, 2008 at 2:10 AM, Tarun Pondicherry
<tarunpondicherry at gmail.com> wrote:
> That's great!  With the ou blog fixes and tinyMCE integration already in
> HEAD, the edublog changes will be much easier to clean up and integrate.

And here we go: http://moodle.org/mod/forum/discuss.php?d=107550

So what I would do next is

0 - clone catalyst's moodle-r2 repo

1.1 - create (and checkout) a new branch 'mdl19-oublogplus' tracking
catalyst's mdl19-oublog (yes, the old code)
1.2 - grab a cvs checkout of Sam's oublog code (from contrib) - use
'-kk' if possible - you might need to do -kb for images
1.3 - rsync Sam's code over the git repo (exclude CVS dirs!)
1.4 - commit that into git, so you have the latest code from Matt,
plus one big patch with all of Sam's changes.

2.1 - create (and checkout) a new branch 'mdl19-edublog' tracking
MOODLE_19_STABLE
2.2 - add a remote with the olpc moodle.git repo too
2.3 - merge in mdl19-tinymce from olpc's moodle.git
2.4 - merge in the oublogplus branch you made locally

So now your newly minted mdl19-edublog branch has a clean 19_STABLE
plus oublog plus tinymce.

Of course, it'll be missing _your work_ on top. But at that point you
can start adding it in well defined commits :-)



cheers,



m
-- 
 martin.langhoff at gmail.com
 martin at laptop.org -- School Server Architect
 - ask interesting questions
 - don't get distracted with shiny stuff  - working code first
 - http://wiki.laptop.org/go/User:Martinlanghoff