Closed Bug 1336820 Opened 8 years ago Closed 8 years ago

Trouble merging m-c to graphics after servo vendoring

Categories

(Developer Services :: Mercurial: hg.mozilla.org, defect)

defect
Not set
normal

Tracking

(Not tracked)

RESOLVED WORKSFORME

People

(Reporter: kats, Unassigned)

References

Details

I tried to do a merge from m-c to the graphics branch (as I do fairly regularly, successfully). I did the merge locally, resolving conflicts, and tried to push to graphics. It failed, below is the output I got. It spent a very long time, I think in the "adding file changes" step, before failing. I can try pushing again but I figured better to let somebody take a look at the server logs to make sure what I'm doing doesn't break anything. The merge commit I'm pushing is ae8db963d2f4, if that matters. kats@kgupta-pc mozilla$ hg push graphics -r tip pushing to ssh://hg.mozilla.org/projects/graphics searching for changes remote: adding changesets remote: adding manifests remote: adding file changes remote: added 8434 changesets with 54358 changes to 5548 files remote: (allowing new root 55e5cc97e3ea because it is in the whitelist) remote: recorded push in pushlog remote: replication log not available; cannot close transaction remote: transaction abort! remote: rolling back pushlog remote: rollback completed remote: pretxnclose.vcsreplicator hook failed abort: push failed on remote
gps, let me know if there's anything I should be doing or if I should just try pushing again.
Flags: needinfo?(gps)
Most likely an intermittent issue. The servo push was merged around just fine on Friday.
Flags: needinfo?(gps)
Thanks. I pushed again and it worked. (Although the decision task failed on the push due to some timeout, but IIRC that happened on autoland as well)
Status: NEW → RESOLVED
Closed: 8 years ago
Resolution: --- → WORKSFORME
You need to log in before you can comment on or make changes to this bug.