483095 - wikipedia-oc searchplugin missing from Firefox 3.1b3

Status: RESOLVED FIXED

(Mozilla Localizations :: oc / Occitan, defect)

Description

[Nick Thomas [:nthomas] (UTC+12)]

Here's the 3.0.x list
 http://mxr.mozilla.org/l10n/source/oc/browser/searchplugins/list.txt
and 3.1b3
 http://hg.mozilla.org/releases/l10n-mozilla-1.9.1/oc/file/FIREFOX_3_1b3_RELEASE/browser/searchplugins/list.txt

Something went wrong in between revisions revision 2ad53328eb9c and 2a4f01829dba which removed it
  http://hg.mozilla.org/releases/l10n-mozilla-1.9.1/oc/log/tip/browser/searchplugins/list.txt

Probably worth checking the other changes in 2a4f01829dba too. Found while doing major update testing from 3.0.7 to 3.1b3.

Comment 1

[Staś Małolepszy :stas]

Attachment: Add wikipedia-oc

No idea why the merge excluded the line with "wikipedia-oc". Anyways, here's the patch. The plug-in's xml is still there intact, so we only need to add "wikipedia-oc" to list.txt on both branches.

Yannig, if you wish, I can land this, but I don't want to mess with your repo, so I'm attaching this patch here first. Let me know if you want me to land it. If you choose to do this yourself, please land it on both branches (l10n-central and releases/l10n-mozilla-1.9.1), use a descriptive check-in comment (e.g. "Bug 483095 wikipedia-oc searchplugin missing from Firefox 3.1b3, p/r=stas") and add fixed... and verified... keywords to this bug.

Thanks!

Comment 2

[Yannig MARCHEGAY]

Once more, I have problems with branches :(

yannig@yannig-portable:~/occitan/firefox/oficial/oc$ hg push
pushing to ssh://hg.mozilla.org/releases/l10n-mozilla-1.9.1/oc
searching for changes
abort: push creates new remote heads!
(did you forget to merge? use push -f to force)
yannig@yannig-portable:~/occitan/firefox/oficial/oc$ hg merge
abort: there is nothing to merge

Comment 3

[Axel Hecht [:Pike]]

Looking at http://hg.mozilla.org/releases/l10n-mozilla-1.9.1/oc, please make sure that you're on the default branch, and sending off changes off of revision bfc7d6be11a5.

hg ident -ib
bfc7d6be11a5 default

is what I get for my unchanged repo. You'll get a different stamp, as you checked something in, but if you are on default, you should

hg push -f.

Comment 4

[Yannig MARCHEGAY]

yannig@yannig-portable:~/occitan/firefox/oficial/oc$ hg ident -ib
99b74f7d62c7 default

Comment 5

[Axel Hecht [:Pike]]

That tells you as much as it tells me.

hg push -f should be fine

Comment 6

[Nick Thomas [:nthomas] (UTC+12)]

Looks like this fix made it for 1.9.1
 http://hg.mozilla.org/releases/l10n-mozilla-1.9.1/oc/log/tip/browser/searchplugins/list.txt
as rev 99b74f7d62c7, but not l10n-central
 http://hg.mozilla.org/l10n-central/oc/log/tip/browser/searchplugins/list.txt

Comment 7

[Staś Małolepszy :stas]

Adding "fixed1.9.1" as per comment 6. Thanks Nick.