Closed Bug 459865 Opened 12 years ago Closed 12 years ago
[eo] Fix RSS reader setup
It seems that the changeset 5a1f98f49835 <http://hg.mozilla.org/l10n-central/eo/rev/5a1f98f49835> broke the RSS reader setup for Esperanto as per bug 453108. The diff is here: http://hg.mozilla.org/l10n-central/eo/diff/5a1f98f49835/browser/chrome/browser-region/region.properties Eduardo, can you fix this please?
Oops, sorry about that. I'm trying to fix it, but it seems hg gets confused (or I'm doing something wrong) if I try to push the correct file (on a clean, just cloned repository). Maybe because it's exactly the previous version. I get an "abort: push creates new remote branches!". I hope somebody #hg can help me out so that I can fix this.
Try doing another 'hg pull -u' (you may want to first do 'hg revert --all' and keep you change somewhere else temporarily) and make sure 'hg branch' shows 'default'.
I have the same problem doing everything from scratch in an empty directory. You can check the details here http://groups.google.fr/group/mozilla.dev.l10n/msg/f14889edf72a25ac I've checked with the people at #hg and ted tells me to go ahead and do the push -f when I get: abort: push creates new remote branches! (did you forget to merge? use push -f to force) Since that doesn't look good I'm asking for comments. Should I go ahead with -f? (Staś, hg pull -u does nothing, no changes found)
I just took the liberty to do that myself. http://hg.mozilla.org/l10n-central/eo/rev/8a73c7525259 is the changeset, on the "default" branch. I was a bit puzzled that I had to force, but apparently I had to. Please continue to be very cautious about pushing stuff with -f, even though in general, there should be a server side hook that keeps you from pushing the wrong heads even if you -f. Stas, I didn't revert any whitespace change for yahoo mail showing up in the original patch, I think the current version is fine, looking at diffs locally and stuff.
Status: NEW → RESOLVED
Closed: 12 years ago
Resolution: --- → FIXED
Thanks Axel! There was an extra space at the end of yahoo mail. If it's ok, good. And yes, I will be cautious. Mercurial is something new. Better safe than sorry.
You need to log in before you can comment on or make changes to this bug.