Hello,

It seems that upstreams we mirror to our Gerrit just love to do history rewriting, so we regularly get stuff like:

INFO:./git-gerrit-mirror:=== Processing: git://git.omapzoom.org (2 repositories) === INFO:./git-gerrit-mirror:Pushing in platform/hardware/ti/omap4xxx.git Everything up-to-date INFO:./git-gerrit-mirror:Pushing in kernel/omap.git remote: Resolving deltas: 0% (0/231) ^Mremote: Resolving deltas: 1% (3/231) ^Mremote: Resolving deltas: 1% (3/231) To ssh://linaro-aosp-sync-bot@gerrit-git:29418/kernel/omap-omapzoom.git cf718d5..d3c5467 p-android-omap-3.0 -> p-android-omap-3.0 ! [rejected] p-android-omap-3.1 -> p-android-omap-3.1 (non-fast-forward) error: failed to push some refs to 'ssh://linaro-aosp-sync-bot@gerrit-git:29418/kernel/omap-omapzoom.git' To prevent you from losing history, non-fast-forward updates were rejected

That means that we're regularly behind in our mirror. This is not new issue, it was spotted soon after the mirror was launched (i.e. half-year ago), and I proposed to do push --force right then, but so far just run a forced push from time to time manually.

Well, I guess it's time to make it automatic. What that would mean? That if you push something to an upstream branch, it will be lost soon, irrecoverably. Note that it's explicitly prohibited per our branch policy to commit anything into upstream branches, all Linaro changes should go into separate branches, named per "linaro*" pattern. And as all changes go thru Gerrit review, I guess there's almost no chance to push something in wrong branch by mistake. Still, I figure I better send a heads-up to remind of all this. (And we're waiting on Gerrit upgrade to enforce branch policy on Gerrit level).

https://bugs.launchpad.net/linaro-android-infrastructure/+bug/956950

Thanks, Paul

Linaro.org | Open source software for ARM SoCs Follow Linaro: http://www.facebook.com/pages/Linaro http://twitter.com/#%21/linaroorg - http://www.linaro.org/linaro-blog