General developer forum

 
 
Picture of Jean Michel
Help for upgrading a custom 2.3 to 2.4 using GIT.
 

Hi guys,

I'm using a local copy of Moodle_23_STABLE git branch and I did several improvements to it, with the respective commits. Let's call this as 'MY_BRANCH'.  

As I would like to work with the newest Moodle_24_STABLE in my branch I merged it and I got lots of conflicts!

Have I another option to upgrade my local customized moodle 23 to the newest 24 without having to fix millions of conflicts?

 

Thanks in advance.-Jean

 
Average of ratings: -
Andrew Normore
Re: Help for upgrading a custom 2.3 to 2.4 using GIT.
 

We use SVN to compare the differences, and MANUALLY patch all your customizations.

Sucks.

 
Average of ratings: -
Davo
Re: Help for upgrading a custom 2.3 to 2.4 using GIT.
Group DevelopersGroup Particularly helpful Moodlers

The best advice I've come across is here: https://moodle.org/mod/forum/discuss.php?d=191774#p834646

Not yet tried it myself, but it makes sense to me and others seem to have found it helpful (you certainly shouldn't ever need to use SVN!).

 
Average of ratings:Useful (1)
Picture of Jean Michel
Re: Help for upgrading a custom 2.3 to 2.4 using GIT.
 

Thanks Davo. Now, I'm testing it..

I get the problem "No such strategy ... patience" in the next line

git merge --strategy-option=patience merge_helper_branch

Maybe the GIT version? Mine is 1.7.1.

I'll try to test without the "--strategy-option" but I'm not sure if this is a good idea

 

 

 
Average of ratings: -
Davo
Re: Help for upgrading a custom 2.3 to 2.4 using GIT.
Group DevelopersGroup Particularly helpful Moodlers

To quote Tim's original post: The --strategy-option=patience bit bascially tells git to try harder at sorting out merge conflicts.

Basically, it is non-essential, it just tells git to try a bit harder than usual.

 
Average of ratings:Useful (1)
Picture of Jean Michel
Re: Help for upgrading a custom 2.3 to 2.4 using GIT.
 

Ok. Done with only 6 conflicts. I think it's great!

Do you know some fast-to-see new feature in order to check if the merge was more or less ok?

Thanks again Davo!

 
Average of ratings: -
Davo
Re: Help for upgrading a custom 2.3 to 2.4 using GIT.
Group DevelopersGroup Particularly helpful Moodlers

The best way to check would be to either do:

git diff MOODLE_24_STABLE..MY_BRANCH
# this will show all the changes from 2.4 => your custom branch

or

gitk MOODLE_24_STABLE..MYBRANCH
# this will show all the commits that are part of your branch, but not in 2.4

(assuming you have gitk installed, and if you don't, you should install it).

If you are working with github, you can also use that to get a nice comparison between the two branches.

 

 
Average of ratings:Useful (1)
Picture of Rex Lorenzo
Re: Help for upgrading a custom 2.3 to 2.4 using GIT.
Group DevelopersGroup Particularly helpful MoodlersGroup Testers

Jean, I would also suggest running the PHPunit tests for Moodle to make sure nothing major is broken: http://docs.moodle.org/dev/PHPUnit

 
Average of ratings:Useful (1)