Re: non-HEAD branches

[Christian Rose <menthos gnome org>]

ons 2004-04-07 klockan 18.20 skrev Adam Weinberger:
> What are the rules regarding non-HEAD (specifically gnome-2-6) branches?
> Can I commit to them? Or should commits go to HEAD? Or both?

How you decide to handle the translations in the different branches is
ultimately up to you.

I'd personally recommend committing to both branches for now, though.
There will be some more GNOME 2.6.x releases made from the gnome-2-6
branches, so keeping the translations in the gnome-2-6 branches still
all polished and shiny makes a lot of sense.
At the same time, new development continues in HEAD, so if you want to
stay a jour with that and get a head start when the GNOME 2.8
translation period really begins, keeping HEAD uptodate aswell also
makes sense.

In any case, should you decide to only update the gnome-2-6 branches for
now for the modules that have such branches, you need to remember
yourself to port your updates that you did on the branch to HEAD later
when you start working on HEAD again. Noone else will do it for you... I
sometimes forget that, which results in me losing the changes and
bugfixes I did on the branch, so that's why I strongly recommend
updating both the branch and HEAD if you can find the time for updating
both.


In case you or someone else is confused about what I said above, I'll
try to summarize it below:

        ==========================================> HEAD (**)
                                               \
                                                |                                                                      New development continues
                                    gnome-2-6 (*)                                                 here. Will be used for
                                                                                                                         GNOME 2.7, GNOME 2.8,
        Will be used for GNOME 2.6.1,                                   GNOME 2.9, GNOME 3.0 and all
        GNOME 2.6.2, etc, but will                                           future releases past GNOME 2.6.
        eventually after that no longer
        be used.

(*) Some modules don't have a gnome-2-6 branch yet; for these GNOME
2.6.x versions are still done from HEAD.
(**) Note that any changes you put in a branch like gnome-2-6 won't
automatically make it to HEAD aswell. It's your responsibility to keep
HEAD updated aswell. Whether you'd like to do it continously, or just
transfer your changes and updates from the branch to HEAD at a later
point, is all up to you, however.


Christian