Re: Stable ab/i18n branch

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Oct 17, 2010, 15:59 UTC
Message-ID: <20101017155934.GC301@burratino>
In-Reply-To: <AANLkTikc80ev+ex6-9RDgO_h-4LEuZf6M9hPAfVQ9oSX@mail.gmail.com>

Ævar Arnfjörð Bjarmason wrote:

Show 8 quoted lines

> Do you mean to re-arrange it so that there's a patch at the front of
> the series that introduces gettext.h with only the fallbacks:
> 
>     #define _(s) (s)
>     #define N_(s) (s)
> 
> And then merge the ~120 gettextize patches first and do the
> infrastructure later?

I don't think that's what he was saying, but I think that _would_ be helpful. So the history could look like:

                     infrastructure
                    /              \
 introduce gettext.h                ab/i18n
                    \              /
                     gettextization
                          /
                          merges from master where appropriate,
                          perhaps just at the beginning for simplicity.

That way, each side could have patches rearranged or squashed when needed without disrupting the other.

What do you think?