942771 - [pt-PT] Merge mozilla-aurora/pt-PT to l10n-central/pt-PT

Status: RESOLVED FIXED

(Mozilla Localizations :: pt-PT / Portuguese, defect)

Description

[Francesco Lodolo [:flod]]

As part of bug 939834 I've just landed some productization changes to mozilla-aurora and wanted to merge Aurora down to Central.

I tried to merge but there are several conflicts. Even transplant wasn't possible.

It would be useful to solve the conflicts and perform a clean merge once and for all.

This is the changeset (on a temporary repository) that results by running 
> hg merge --tool internal:local
which means: merge, in case of conflicts keep what's on l10n-central and discard mozilla-aurora

https://bitbucket.org/flod/temp_ptbr/commits/761dbbb503b379bd514581e4c86b75fb11428fa2

It mostly seems License headers.

And this is what I get running internal:other (keep mozilla-aurora in case of conflict), which is even more confusing
https://bitbucket.org/flod/temp_ptpt2/commits/d283d9edfb752d2b2d08fd8235d317100ef1e13c

Comment 1

[Carlos Simao]

https://bitbucket.org/flod/temp_ptbr/commits/761dbbb503b379bd514581e4c86b75fb11428fa2 is referencing to pt-BR and Not pt-PT
https://bitbucket.org/flod/temp_ptpt2/commits/d283d9edfb752d2b2d08fd8235d317100ef1e13c is for pt-PT

My question is: is this for pt-PT or for pt-BR? There are diferences in both languages and teams so need to know for which one and

Comment 2

[Francesco Lodolo [:flod]]

(In reply to Carlos Simao from comment #1)
> https://bitbucket.org/flod/temp_ptbr/commits/
> 761dbbb503b379bd514581e4c86b75fb11428fa2 is referencing to pt-BR and Not
> pt-PT

Sorry, just bad copy and paste.

internal:local
https://bitbucket.org/flod/temp_ptpt/commits/e594ec7fb5192b9d09f120bad35f8b6b6d066d53

internal:other
https://bitbucket.org/flod/temp_ptpt2/commits/d283d9edfb752d2b2d08fd8235d317100ef1e13c

Comment 3

[Carlos Simao]

Headers are a easy thing, but mozilla-aurora is a not allways synced with the latest typos corrections (and we had lots of small corrections in the past months) even if, like it is now, its ok for production.
I will check it.

Comment 4

[Francesco Lodolo [:flod]]

Since pt-PT has moved to Pootle, and there has been no activity in a while on l10n-central, I merged mozilla-aurora into l10n-central and pushed back the merged repository to aurora: nothing has actually changed in the files (double checked), only history will look strange for a bit.