Hello there,
Lately we've introduced ourselves to SVN, and have been having great results with it. I couldn't imagine developing without some sort of version control now.
We've taken version 1.5.3+ and have applied various hacks and changes. (we're a K-12, so instant messaging between students is a no no). In addition, we've done a few other changes to core files and such.
Now here's the catch, we'd like to upgrade to version 1.6, and keep our changes. I figured the best way to go would be to isolate our changes to a "patch file", so I pulled 1.5.3+.tar.gz from sourceforge, and then ran a diff between our version and 1.5.3+. The diff results in an incredibly huge file that weighs in at a staggering 584867 lines long.
I'm sure at this point it is "user error" and I'm not ashamed to admit it. So what is the best way to upgrade our Moodle to 1.6 and beyond?
Thanks,
Richie Foreman
Mesa Public Schools, Mesa Arizona.
Richie,
the easiest thing for you to do is to diff against the release you customised, save that diff, and try to apply it (with patch) to the new release.
However, you are taking a hard road in using SVN for vendor branch tracking (that's the conventional name of what you are doing). You probably want to give these threads a read for more background:
Merging Custom Moodle Code With Stable Releases
http://moodle.org/mod/forum/discuss.php?d=34472
Development tools - diff visualisatio
http://moodle.org/mod/forum/discuss.php?d=39275
Tracking Moodle CVS with git
http://moodle.org/mod/forum/discuss.php?d=42275
the easiest thing for you to do is to diff against the release you customised, save that diff, and try to apply it (with patch) to the new release.
However, you are taking a hard road in using SVN for vendor branch tracking (that's the conventional name of what you are doing). You probably want to give these threads a read for more background:
Merging Custom Moodle Code With Stable Releases
http://moodle.org/mod/forum/discuss.php?d=34472
Development tools - diff visualisatio
http://moodle.org/mod/forum/discuss.php?d=39275
Tracking Moodle CVS with git
http://moodle.org/mod/forum/discuss.php?d=42275
Martin's the guru on this one. But just to add: the reason you got such a big diff is most likely because you're using a different 1.5.3+ - remember that the plus sign means "continuously updated with essential security patches etc". You can use the unix cvs command (rather than the bundled tar.gz files) to get a copy of Moodle from the MOODLE_15_STABLE branch, as it was on exactly the date you downloaded it. The cvs manpages tell you how to do that.