Closed Bug 650255 Opened 15 years ago Closed 15 years ago

[de] merge releases/l10n/mozilla-aurora/de into l10n-central and backout to make next aurora drop easy for German

Categories

(Mozilla Localizations :: de / German, defect)

Product:
Mozilla Localizations
Component:
de / German
Type:
defect
Priority:
Not set
Severity:
normal

Tracking

(Not tracked)

Status:
RESOLVED FIXED

People

(Reporter: Pike, Assigned: Pike)

References

Details

gandalf backed out a few landings to l10n-central for aurora for your locale, because those were strings that landed in en-US post the aurora cut for en-US. Now, on the next time you want to merge your work from central to aurora (around May 17), those backouts would just stick and remove the strings from your work again. The way to make hg likely do the right thing, or at least throw a merge conflict at you, is to land the "backout" changesets from aurora on l10n-central, back them out, and potentially merge. Double negation style, yeah, somewhat hard to wrap your head around. I can do that for you, but I want to make sure that you're good with it, and that we find the right time window so that your hg work doesn't clash. Sorry for the trouble, I'll do my best to make the next iteration suck less.
I think we'll just need to backout the backout there, as probably none of those changes were for changes on m-c after the aurora uplift :(
Gah, yes, that "backout" looks like it just removed that strings I added for unbreaking ChatZilla, which has no effect on m-c at all... :(
Yes, sorry. Want me to do that or are you going to go ahead yourself with the backout of http://hg.mozilla.org/releases/l10n/mozilla-aurora/de/rev/80d4aa3a5952 ?
I won't be around until Tuesday (and then will have some backlog to work), so I'd be happy if someone else does this as long as it's "fresh", so other people in the team can work on the repos without causing problems in this.
Taking, doing the backout.
Assignee: nobody → l10n
Status: NEW → ASSIGNED
http://hg.mozilla.org/releases/l10n/mozilla-aurora/de/rev/066d3f7592dc, backout landed, marking FXED.
Status: ASSIGNED → RESOLVED
Closed: 15 years ago
Resolution: --- → FIXED
Thanks a lot!
You need to log in before you can comment on or make changes to this bug.