i18n repo is broken

[Nikolaj Sjujskij]

Den 2013-01-02 10:22:42 skrev Matt Mackall <mpm at selenic.com>:

> This merge is wrong:
>
> https://bitbucket.org/mg/hg-i18n/commits/ab78843c2fc6a412a73fe71564b7542319f091cd
>
> It actually merges default into stable and nearly caused me to leak 2
> months of development into a bugfix release. The only person in the
> project who should ever do such a merge is me, which I do at the start
> of the code freeze.
>
> Really, there is no good reason to do cross-branch merges in the i18n
> repo in either direction. I will end up doing all the necessary merges
> from stable into default when I pull.
>
> So: please do not do merges across named branches at all in the i18n
> repo. At this point, all work there should happen strictly on the stable
> branch, in the i18n/ directory.

In  that case http://mercurial.selenic.com/wiki/TranslatingMercurial  
should be edited, since it advises to:

     If your change concerns the stable branch, then please remember to  
update to
     that branch. It is then imperative that you merge the stable branch  
into
     the default branch. The rule is that your xx repository
     must always be a superset of your xx-stable repository. That will  
ensure
     that i18n remains a superset of i18n-stable and so no merges will be
     necessary later.