Closed Bug 940923 Opened 11 years ago Closed 10 years ago

[es-CL] Merge mozilla-aurora/es-CL to l10n-central/es-CL

Categories

(Mozilla Localizations :: es-CL / Spanish (Chile), defect)

defect
Not set
normal

Tracking

(Not tracked)

RESOLVED FIXED

People

(Reporter: flod, Assigned: flod)

References

Details

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 down to central but it's a mess, changed strings all over the place. I couldn't even transplant the changeset, because searchplugins were completely different, so I had to manually port the changes. http://hg.mozilla.org/l10n-central/es-CL/rev/e10ac0830cef How do you work on repositories? Which one is you main repository (aurora, beta, central)? It would nice to merge Aurora to Central to start clean, and then follow the proper procedures to move strings between repositories.
Yes, it is chaotic I manually port the changes from central (main repository) to aurora; at the next cycle I hope to have the repositories more similar (merging as you say from aurora to central, after manually porting the changes from this cycle), but I will need some help on this.
Status: NEW → ASSIGNED
If l10n-central is your main repository, there's also the possibility to merge down to Aurora and, in case of conflict, keep the file on central. I'll get back to this bug as soon as I've finished working on the main bug. For now productization is correct, since I've manually ported the changes on l10n-central.
As requested via email Removed unused /mobile folder http://hg.mozilla.org/releases/l10n/mozilla-aurora/es-CL/rev/42bc6c2ff5c0 Ported mozilla-aurora content into l10n-central, merged http://hg.mozilla.org/l10n-central/es-CL/rev/000ea610081a Pushed merged state also to mozilla-aurora. Don't forget to update your local repositories before doing anything hg pull -r default hg update
Assignee: nobody → francesco.lodolo
Status: ASSIGNED → RESOLVED
Closed: 10 years ago
Resolution: --- → FIXED
You need to log in before you can comment on or make changes to this bug.