Closed Bug 972769 Opened 6 years ago Closed 6 years ago
[lv] Merge aurora to central: push creates new remote branches
As part of bug 967388, I landed my fix on mozilla-aurora http://hg.mozilla.org/releases/l10n/mozilla-aurora/lv/ Then tried to merge mozilla-aurora down to l10n-central. http://hg.mozilla.org/l10n-central/lv/ > hg pull -r default ../mozilla-aurora > hg merge > hg commit -m "Merge Aurora to Central" This is what I get when I try hg push > pushing to ssh://hg.mozilla.org/l10n-central/lv/ > searching for changes > abort: push creates new remote branches: GECKO270b8_2014012015_RELBRANCH! > (use 'hg push --new-branch' to create new remote branches) Any idea why this is happening? Merge from beta to aurora with forced push? I checked other repositories and I don't see recent Beta's branches in aurora. A merge was done last November for bug 939834 with "--tool internal:other", since repository hasn't been used for years and all updates were actually on aurora. Is it OK to just push with --new-branch? For now I've just transplanted the changeset.
(In reply to Francesco Lodolo [:flod] from comment #0) > Is it OK to just push with --new-branch? Forgot to ni pike
I suspect you pulled without -r default at some point, and got the relbranches over. You usually want to pull -r default and push -r default, to be sure.
I did a merge a few months ago without issues, if something happened it did between aurora and central in the last couple of months http://hg.mozilla.org/releases/l10n/mozilla-aurora/lv/graph This is what I usually do hg clone ssh://hg.mozilla.org/releases/l10n/mozilla-aurora/lv/ mozilla-aurora hg clone ssh://hg.mozilla.org/l10n-central/lv l10n-central hg -R mozilla-aurora pull -r default hg -R l10n-central pull -r default cd l10n-central hg pull -r default ../mozilla-aurora hg merge hg commit -m "Merge Aurora to Central" hg push -r default pushing to ssh://hg.mozilla.org/l10n-central/lv searching for changes abort: push creates new remote branches: GECKO270b8_2014012015_RELBRANCH! (use 'hg push --new-branch' to create new remote branches)
OK, yea, we need to push the merged branch now. Raivis, please don't merge relbranches, you should never need to do that. It might ask you to push -f every now and then, but that's fine.
Thanks, pushed with --new-branch
Status: NEW → RESOLVED
Closed: 6 years ago
Resolution: --- → FIXED
You need to log in before you can comment on or make changes to this bug.