[Lemon-devel] HG repository reporganizations

[Alpár Jüttner]

Hi,

With the appearance of the 1.0 release branch some changes has appeared
in the public hg repositories. Currently we have three repos:

http://lemon.cs.elte.hu/hg/lemon

        This repository contains everithing, both the main branch and
        the 1.0 release branch. This is the repo you can browse from the
        trac webpage. There is a pull-down menu for choosing a branch or
        a tagged revision (release 1.0 is tagged with 'r1.0').
        
http://lemon.cs.elte.hu/hg/lemon-main

        This repo is equivalent with
        http://lemon.cs.elte.hu/hg/lemon#default , i.e. it contains only
        the main development branch. For a mainline development, it is
        probably the best to use this repo.
        
http://lemon.cs.elte.hu/hg/lemon-1.0

        This is the repository of the 1.0 release branch, it is
        equivalent with http://lemon.cs.elte.hu/hg/lemon#1.0 . You
        should use this if you want to fix a bug in LEMON 1.0.
        
If a bugfix should also be applied to the main, then you must choose the
last common revision as a parent, which is a bit tricky to find. Also
the bugfix changeset should belong to the 'default' branch in this case.

Here is how to do it:

        $ hg clone http://lemon.cs.elte.hu/hg/lemon#1.0 bugfix
        $ cd bugfix
        $ cd hg up default
        [... fix the bug ... ]
        $ hg ci -m 'Bugfix in ArgParser, see #123'

Now let's merge to the main and the 1.0 branch

        $ hg tag -l my-fix       # '-l' is important
        $ hg up 1.0
        $ hg merge
        $ hg ci -m 'Merge bugfix for #123'           # Merge to 1.0
        $ hg pull http://lemon.cs.elte.hu/hg/lemon
        $ hg merge my-fix
        $ hg ci -m 'Merge'                             # Merge is to
        main
        
It's quite easy, isn't it?

Best regards,
Alpar