Project

General

Profile

Actions

Merging branches 1.9x - 1.10 - 1.11

Conditions:
  1. You have a cloned version of the 1.10 branch.
  2. You have a diff viewer like meld

In a Chamilo 1.10 - 1.11 repository

Make sure you already sent all your commits to the repository

cd /var/www/chamilo10
hg status

Get the latest changes from the repo:

hg pull
hg update -C

Check the current "heads"

/var/www/chamilo10$ hg heads

changeset:   20032:26eded6e4113
branch:      1.9.x
tag:         tip
user:        Julio Montoya 
date:        Mon Oct 15 15:42:53 2012 +0200
summary:     Adding security::remove_XSS see #3919

changeset:   19997:aa0f38105f02
user:        Julio Montoya
date:        Tue Oct 09 14:36:11 2012 +0200
summary:     Adding course_id in the session_* tables see #5614

changeset:   15766:9766fe47c617
branch:      1.8.8.6
parent:      15764:cf31612fe833
user:        ywarnier
date:        Thu Jul 19 22:44:03 2012 -0500
summary:     Tagging 1.8.8.6 code - Security fix release

You can see the first changeset 20032 with the branch name "1.9.x" that's the one you have to merge

hg merge -r 20032

If you set your "merge" value in your ~/.hgrc mercurial file correctly a new window will be prompted if you have some merge to do.
In my case is meld:

[ui]
merge = meld

After you end with all the merge stuff you can commit/push to the repository

hg commit -m "Merging from branch 1.9.x" 
hg push

Now your Chamilo 1.10 is updated with the bugfixes from the "stable" branch 1.9.x

Updated by Julio Montoya about 7 years ago · 1 revisions