i18n repo is broken

[Nikolaj Sjujskij]

Den 2013-01-15 14:44:39 skrev Alexander Sauta <demosito at gmail.com>:

> By the way, just to clear it out: do I understand correclty that my main
> mistake (aside for performing a merge, which should be done by Matt) was
> wrong merge direction ('hg up stable; hg merge default')? If I've chosen
> default branch as a first parent (i.e. 'hg up default; hg merge stable'),
> would it be ok? Because in that case all the changes would left on  
> default branch, leaving stable effectively intact when doing
> 'hg update stable'? Or I understand merge direction wrong?
That's right, but now the policy is to commit i18n to stable only and  
abstain from interbranch merges (unless you're mpm).


> 2013/1/15 Nikolaj Sjujskij <sterkrig at myopera.com>
>
>> Den 2013-01-14 19:41:41 skrev Alexander Sauta <demosito at gmail.com>:
>>
>>
>>  Wow, guys, I'm really sorry about that merge. I was in a hurry trying  
>> to
>>> finish everything before my New Year holidays and obviously did a wrong
>>> merge. I decided do it according to the mentioned paragraph in wiki
>>> article. I won't make this mistake in future and will always commit the
>>> translation to stable branch.
>>>
>> Then it's time to strip hg-i18n-ru[1] and resume its operation :)
>>
>> [1] https://bitbucket.org/**demosito/hg-i18n-ru/issue/2/**
>> strip-ab78843-invalid-default-**stable-merge<https://bitbucket.org/demosito/hg-i18n-ru/issue/2/strip-ab78843-invalid-default-stable-merge>
>>
>>
>>
>>  -----Исходное сообщение-----
>>> От:  
>>> mercurial-devel-bounces@**selenic.com<mercurial-devel-bounces at selenic.com>[mailto:
>>> mercurial-devel-**bounces at selenic.com<mercurial-devel-bounces at selenic.com>]
>>> От имени Nikolaj Sjujskij
>>> Отправлено: Sunday, January 13, 2013 3:44 PM
>>> Кому: Matt Mackall
>>> Копия: mercurial-devel at selenic.com
>>> Тема: Re: i18n repo is broken
>>>
>>>  On Thu, 2013-01-10 at 21:59 +0400, Nikolaj Sjujskij wrote:
>>>>
>>>>> Den 2013-01-10 17:34:22 skrev Martin Schröder
>>>>>
>>>>>> Yes. All translation work should be done on stable.
>>>>>>
>>>>>   Er... So every new major version has to be translated during
>>>>> feature freeze, isn't it? Seems a bit weird to me.
>>>>>
>>>>
>>>> My model for how things should work is Wagner Bruna, who's kept the
>>>> Brazilian Portugese translation fully in sync for years now:
>>>>
>>>> $ hg log -r 'keyword(i18n) and branch(default) and keyword(wagner) and
>>>> not merge()' | less
>>>>
>>>> He stopped doing actual translation work on default back in 2010. His
>>>> changes to sync with 2.4 look like this:
>>>>
>>>> $ hg diff -r '"2.4-rc"::2.4' pt_BR.po  | egrep '[+]msgstr ".+"' | wc
>>>>      60     420    2925
>>>>
>>>> ..which seems like a manageable amount of catch-up work.
>>>>
>>>> Perhaps Wagner is not a realistic role-model. But there's also no
>>>> necessity or expectation that every translation catch up immediately
>>>> either.
>>>>
>>>
>>> All right, that seems fair. At least that saves a bit of confusion  
>>> about
>>> selecting a branch (which is probably common, since I remember myself
>>> thinking about proper branch). The wiki article is also consistent, so
>>> there will be probably no problems like this anymore.
>>> ______________________________**_________________
>>> Mercurial-devel mailing list
>>> Mercurial-devel at selenic.com
>>> http://selenic.com/mailman/**listinfo/mercurial-devel<http://selenic.com/mailman/listinfo/mercurial-devel>
>>>