Migrating changesets from one channel to another

[Ricardo Palomares Martí­nez]

Hi,

I've found a wrong translation in debugger.dtd. Trying not to upset
flod, as it is Christmas time, :-) I've started fixing it in beta [1].
Then I've tried to migrate the changeset to aurora following the
Uplifting localization... doc in MDN, just replacing aurora with beta
and central with aurora.

Everything goes right until I reach the final part:

...
# push to central (Aurora for me)
hg push ../l10n-central/ab-CD
# push to aurora (Beta for me) *** THIS FAILS ***
hg push ../releases/l10n/mozilla-aurora/ab-CD
# push l10n-central upstream (Aurora for me)
cd ../l10n-central/ab-CD
hg push
# push aurora upstream (Beta for me)
cd ../../releases/l10n/mozilla-aurora/ab-CD
hg push

When I try to push to my local l10n-beta, I get this:

~/mozilla-l10n/repos/workrepo $ hg push ../l10n-mozilla-beta/es-ES
pushing to ../l10n-mozilla-beta/es-ES
searching for changes
abort: push creates new remote branches:
MOBILE140_2012051016_RELBRANCH, MOBILE140_2012051517_RELBRANCH,
MOBILE140_2012052309_RELBRANCH, MOBILE140_2012052310_RELBRANCH,
MOBILE140_2012052413_RELBRANCH, MOBILE140_2012053010_RELBRANCH,
MOBILE140_2012060113_RELBRANCH!
(use 'hg push --new-branch' to create new remote branches)

The rest of the document has gone without glitches; no manual merges
needed, no messages out of ordinary in commits, merges and patches...

I've pushed my local aurora upstream, as it seems correct [2]. Hope
not having broken anything by doing it. O:-) Anyway, I'm probably done
something wrong, but I just can't see it.

TIA

[1]
http://hg.mozilla.org/releases/l10n/mozilla-beta/es-ES/rev/ab9d016980a3
[2] http://hg.mozilla.org/releases/l10n/mozilla-aurora/es-ES/graph


--
Ricardo Palomares (RickieES)
http://www.mozilla-hispano.org/
http://www.proyectonave.es/
https://diasp.eu/u/rickiees

[Axel Hecht]

The difference is that you want to restrict the exchange of changesets
to the 'default' branch.

You pushed a host of relbranches and tags, nothing bad, just
distracting, I guess.

In the future, just

hg push -r default

or

hg pull -r default

or even use an explicit revision you want to get across.

Axel

[Francesco Lodolo [:flod]]

Il 19/12/13 23:27, Ricardo Palomares Mart�nez ha scritto:

> Then I've tried to migrate the changeset to aurora following the
> Uplifting localization... doc in MDN, just replacing aurora with beta
> and central with aurora.

Since you fixed it on Beta, you just needed to merge Beta down to Aurora
(you don't need Aurora's strings in Beta, as when you uplift Central
strings to Aurora after merge day).

This is what I usually do (from mozilla-aurora's folder):

# hg pull -r default ../mozilla-beta
# hg merge
# hg commit -m "Merge Beta to Aurora"
# hg push

This usually comes clean, since you shouldn't have merge conflicts
between Beta and Aurora (unless it happens in this case, after all the
merges between Aurora and Central for es-ES).

Francesco

[Ricardo Palomares Martí­nez]

El 20/12/13 08:30, Francesco Lodolo [:flod] escribió:

> This is what I usually do (from mozilla-aurora's folder):
>
> # hg pull -r default ../mozilla-beta
> # hg merge
> # hg commit -m "Merge Beta to Aurora"
> # hg push
>
> This usually comes clean, since you shouldn't have merge conflicts
> between Beta and Aurora (unless it happens in this case, after all the
> merges between Aurora and Central for es-ES).

OK, then I think I'm fine, although I used the intermediate "workrepo"
repository. The relevant changesets are the top one in Beta and the
top two in Aurora:

http://hg.mozilla.org/releases/l10n/mozilla-beta/es-ES/
http://hg.mozilla.org/releases/l10n/mozilla-aurora/es-ES/

Thank you both.