1337050 - Pushing graphics branch to m-c is disallowed due to servo hook

Status: RESOLVED WONTFIX

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

Description

[Kartikaya Gupta (email:[e-mail])]

To get the Quantum Render project merged to m-c, I tried doing a merge from the graphics branch to m-c. This failed because of the servo vendor hook (see output below). gps asked me to file a bug, so here it is.

kats@kgupta-pc mozilla$ hg push m-c -r tip
pushing to ssh://hg.mozilla.org/mozilla-central
searching for changes
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 384 changesets with 4641 changes to 2681 files
remote: (1 changesets contain changes to protected servo/ directory: d52552ae7dcf)
remote: ************************************************************************
remote: you do not have permissions to modify files under servo/
remote:
remote: the servo/ directory is kept in sync with the canonical upstream
remote: repository at https://github.com/servo/servo
remote:
remote: changes to servo/ are only allowed by the syncing tool and by sheriffs
remote: performing cross-repository "merges"
remote:
remote: to make changes to servo/, submit a Pull Request against the servo/servo
remote: GitHub project
remote: ************************************************************************
remote: transaction abort!
remote: rollback completed
remote: pretxnchangegroup.e_prevent_vendored hook failed
abort: push failed on remote

Comment 1

[Kartikaya Gupta (email:[e-mail])]

(Note that the merge doesn't actually try to change anything in servo/ - that is, running |hg diff -r tip -r m-c| shows no changes to any files in servo/. The commit in question is a merge commit from somewhere in the graphics history.)

Comment 2

[Gregory Szorc [:gps]]

I'll look into this. Give me a few minutes for contemplate a longer-term solution.

If you want me to do the merge manually, ping me on IRC.

Comment 3

[Kartikaya Gupta (email:[e-mail])]

I assume we can close this now. The current state of affairs isn't blocking the QR merge any more, since KWierso did the merge for us. Feel free to reopen if you still want to use this for tracking anything.

Comment 4

[:glob ✱]

some clarification around the issue: because this is a merge, it implicitly touches servo/, which triggers the rejection hook.

it's technically possible for smarts to be added to the hook to detect merges, inspect the changes, and allow merges that don't actually touch servo/, however that won't happen in the short term.

until/if that happens the work around is for the sheriffs to perform merges.