1034187 - Intermittent time travel in legacy vcs

Status: RESOLVED WONTFIX

(Release Engineering :: General, defect)

Description

[hwine]

Occasionally getting a noisy, but (luckily) non-fatal error message:
    remote: error: denying non-fast-forward refs/heads/v1.3 (you should pull first)
    To git+ssh://git.m.o/releases/gecko.git
    ! [remote rejected] b2g28_v1_3 -> v1.3 (non-fast-forward)
    error: failed to push some refs to 'git+ssh://git.m.o/releases/gecko.git'

These generate email to release+vcs2vcs@

N.B.: there are NO issues with either of the repositories on hg.m.o or git.m.o -- the issue is transient and within the legacy code conversion repo.

Because we have the git.mozilla.org/releases/gecko.git set to not allow non-fast forward updates, the transient issues never becomes visible.

Comment 1

[hwine]

After catching the issue with verbose logging, I found:

Next page event shows no additional info in debug log, except:
    = [up to date]      B2G_2_0_20140609_MERGEDAY -> B2G_2_0_20140609_MERGEDAY
    ! [remote rejected] b2g28_v1_3 -> v1.3 (non-fast-forward)
    updating local tracking ref 'refs/remotes/git_stage/gecko-18'
    updating local tracking ref 'refs/remotes/git_stage/master'
Which leads to inquiry on local repo:
    [[e-mail]3 mc-cvs-ma-update-test3]$ git show-ref b2g28_v1_3 v1.3 refs/remote/git_stage/v1.3
    96af887161b82a3a325c2a701f562e7084c126e1 refs/heads/b2g28_v1_3
    96af887161b82a3a325c2a701f562e7084c126e1 refs/heads/v1.3
    e0bfab94fd20e4dcbb2fecf19d7c2dc606189f81 refs/remotes/git.m.o/v1.3
    e0bfab94fd20e4dcbb2fecf19d7c2dc606189f81 refs/remotes/git_stage/v1.3

Note that the "local" v1.3 tip is actually a commit from June 30 -- we
went back in time!!!!!
    commit 96af887161b82a3a325c2a701f562e7084c126e1
    Author: Sami Jaktholm <[e-mail]>
    Date:   Mon Jun 30 03:09:00 2014 -0400

Thus the issues is:
 a) contained to the conversion repo
 b) appears to be a temporary glitch in hg bookmark setting, that self resolves on a subsequent run

Given those two facts, this is important, but not production impacting.

Comment 2

[hwine]

no longer meaningful in light of bug 1277297