Thanks for the update on this, John! I have a number of questions about this:
1. On the issue of the hg tags, can you please be more specific about the problem that you're encountering? In my experience, git deals with updated tags the same way as it does with any non-fast-forward merge, and I've never experienced any problems with that. 2. How frequently are these branches updated? 3. What are the plans for adding the rest of the branches that we currently have in https://github.com/mozilla/mozilla-central, an what is the process for developers to request their project branches to be added to the conversion jobs? Right now the process is pretty light-weight (they usually just ping me on IRC or send me an email). It would be nice if we kept that property. 4. About the interaction between gecko.git and beagle, when you say that they cannot be identical, are you talking about the location where they're hosted or the SHA1s for the same commits? I think we need to guarantee the latter being identical going forward, but the former doesn't matter as much. 5. Is the git-mapfile generated from the conversion scrips available somewhere? (Mine is currently available here: http://git.mozilla.org/?p=users/eakhg...@mozilla.com/mozilla-history-tools.git;a=history;f=updates/git-mapfile;h=5c8ecf4bf1d7339ad1dff1ea4ab62a712da2fb6c;hb=HEAD ) 6. Do you have any plans for how we're going to approach the problem of migrating the current git mirror with beagle? Specifically, I think we need to: a) Figure out how github deals with a repository being deleted/recreated, would that break people's forks, stars, etc.? b) Are there any alternative solutions in replacing all of the branches/tags under mozilla/mozilla-central with the new repo? c) What is the developer work flow going to look like in rebasing the local branches once the move has been completed? Cheers, -- Ehsan <http://ehsanakhgari.org/> On Fri, Aug 30, 2013 at 9:29 PM, John O'Duinn <jodu...@mozilla.com> wrote: > (cross-posting to make sure this is not missed; please respond in > dev-planning or bug#847727) > > > > tl,dr: we're moving replication of gecko+gaia repos to more robust > systems. This email gives quick status, and summary of rollout plan. > > > > > In the rush to B2G 1.0 release, we had to quickly stand up replication > systems to mirror changes from github to hg.m.o and to git.m.o. These > locally-patched systems replicate 368 repos, 24x7, and have carried us > a long way, but they are fragile to network/system hiccups, and tricky > to configure for new branches. Now that v1.0 has shipped, and we're > into more predictable development cadence, its time to switch to more > robust systems. > > Over the last few months, we've been standing up new systems alongside > our current production systems. On the new systems, we've been testing > newer version of hg-git conversion by running our biggest, most > comprehensive testdata we have - the entire cvs-history and hg-history > of mozilla-central. When we hit problems that break the hg-git > conversion tools, we upstreamed fixes to the hg-git tools. Being able > to process all the edge-cases that Mozilla developers have thrown at > cvs and hg since the start of Mozilla gives us confidence that these > scripts are robust enough to use in production going forward. > > The curious can see the generated, fully converted repo, at > https://github.com/escapewindow/test-beagle. It's roughly equivalent to > https://github.com/mozilla/mozilla-central, but with SHAs that match > http://git.mozilla.org/?p=releases/gecko.git;a=summary . > > The "test-beagle" repo currently contains: > * mozilla-central with full CVS history > * mozilla-b2g18 > * mozilla-b2g18_v1_1_0_hd > * mozilla-b2g18_v1_0_1 > * mozilla-b2g18_v1_0_0 > * mozilla-aurora > * mozilla-beta, with relbranches > * mozilla-release, with relbranches > * mozilla-esr17 > * mozilla-inbound > * b2g-inbound > * fx-team > > If you see anything that looks wrong in this repo, please do let us know. > > Note: > 1) Do *not* use this for any production work or real development > work... not just yet. This repo is, as the name suggests, a test repo > that we reserve the right to reset at any point as/when we find problems. > 2) The branches to be included in this repo, and the final name and > location of the "test-beagle" repo, are still in flux. We're > considering having separate conversions of other repos that can be > pulled into local clones if desired. For more background, read the blog > post below for details. > 3) Note that these can not be identical repos due to partner > requirements for gecko.git; see the blog post below). > 4) All the release branches generated per release are present, but > currently no release tags. Moving tags is problematic in git; see the > blog post below for details. > > > Our rollout plan is to: > * enable "test-beagle" repo in mozilla account on github (using real > name of course!) > * replace/reset these repos on github > (https://github.com/mozilla/releases-mozilla-central, > https://github.com/mozilla/releases-mozilla-aurora, > https://github.com/mozilla/releases-mozilla-release) since they don't > have CVS history and have a different set of SHAs. If they're unneeded > and we can nuke 'em, even better. > * switch over http://git.mozilla.org/?p=releases/gecko.git;a=summary > to be on these new scripts. As the SHAs are the same, this should be > invisible to Mozilla devs and partners using it, and should buy us > better stability. > > There's plenty of other work after this deploy is completed (l10n, > bitbucket, etc), but this is a big leap forward and exciting to see. > > > Hope all that makes sense - for more information, please see: > * the blog post http://escapewindow.dreamwidth.org/238476.html > * the bug https://bugzilla.mozilla.org/show_bug.cgi?id=847727 > > > > Thanks > Aki, Hal and John. > > _______________________________________________ > dev-platform mailing list > dev-platform@lists.mozilla.org > https://lists.mozilla.org/listinfo/dev-platform > > _______________________________________________ dev-platform mailing list dev-platform@lists.mozilla.org https://lists.mozilla.org/listinfo/dev-platform
