Filed by: cbook [at] mozilla.com https://treeherder.mozilla.org/logviewer.html#?job_id=92605371&repo=mozilla-central https://queue.taskcluster.net/v1/task/XnPSDSaxSN-RYv6bP0gBFA/runs/0/artifacts/public/logs/live_backing.log

Hi Brian, seems this caused https://treeherder.mozilla.org/logviewer.html#?job_id=92605371&repo=mozilla-central since this is tier 2 i do not back this out but we should fix this. Filed Bug 1357673 for this

dustin and I are trying to figure out why this test didn't get run in my try push now.

Comment on attachment 8859768 [details] Bug 1357673 - Fix try syntax tests https://reviewboard.mozilla.org/r/131772/#review134898

We're sorry, Autoland could not rebase your commits for you automatically. Please manually rebase your commits and try again. hg error in cmd: hg rebase -s e78e96385411 -d 9faa446314c3: rebasing 391017:e78e96385411 "Bug 1357673 - Fix try syntax tests r=dustin" (tip) merging taskcluster/taskgraph/test/test_try_option_syntax.py warning: conflicts while merging taskcluster/taskgraph/test/test_try_option_syntax.py! (edit, then use 'hg resolve --mark') unresolved conflicts (see hg resolve, then hg rebase --continue)

We're sorry, Autoland could not rebase your commits for you automatically. Please manually rebase your commits and try again. hg error in cmd: hg rebase -s e78e96385411 -d 0cbed2ce192a: rebasing 391033:e78e96385411 "Bug 1357673 - Fix try syntax tests r=dustin" (tip) merging taskcluster/taskgraph/test/test_try_option_syntax.py warning: conflicts while merging taskcluster/taskgraph/test/test_try_option_syntax.py! (edit, then use 'hg resolve --mark') unresolved conflicts (see hg resolve, then hg rebase --continue)

Hi Brian, see comment 6 seems it needs rebasing

Yep, working on it now. The file changed significantly enough that I'm spending some time trying to get the tests to pass again. Should be ready shortly.

Comment on attachment 8860461 [details] Bug 1357673 - Fix extra platforms in try parsing test https://reviewboard.mozilla.org/r/132456/#review135330

Pushed by ihsiao@mozilla.com: https://hg.mozilla.org/integration/autoland/rev/b4de4eac22e8 Fix try syntax tests r=dustin https://hg.mozilla.org/integration/autoland/rev/8dc9105b0dff Fix extra platforms in try parsing test r=dustin

sorry had to back this out for merge conflict, please help to rebase. Thank you.

Backout by ihsiao@mozilla.com: https://hg.mozilla.org/integration/autoland/rev/b22d78c33a95 Backed out changeset 8dc9105b0dff for merge conflict https://hg.mozilla.org/integration/autoland/rev/f87e84a9c879 Backed out changeset b4de4eac22e8

We're sorry, Autoland could not rebase your commits for you automatically. Please manually rebase your commits and try again. hg error in cmd: hg rebase -s f087a88af034 -d 69364e8ccec5: rebasing 391505:f087a88af034 "Bug 1357673 - Fix try syntax tests r=dustin" (tip) merging taskcluster/taskgraph/test/test_try_option_syntax.py warning: conflicts while merging taskcluster/taskgraph/test/test_try_option_syntax.py! (edit, then use 'hg resolve --mark') unresolved conflicts (see hg resolve, then hg rebase --continue)

WHYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYY?!!!?!

Brian, I suspect autoland is just screwed up somehow, maybe a bug in hg. I'll try pushing the change to inbound instead.

https://hg.mozilla.org/integration/mozilla-inbound/rev/7d1fa6a47ab91cf16c52e6dc49d70b50ea02332a Bug 1357673 - Fix try syntax tests r=dustin

If that doesn't work, let's open a bug in dev services to figure out what's wrong.

Turns out it was an actual conflict with something that landed earlier today for bug 1357465. And now, this patch is conflicting with that on the merge to inbound, so I'm going to back you out to free the merge up. Feel free to rebase onto the current mozilla-central and it should autoland without a problem.

Backout in https://hg.mozilla.org/integration/mozilla-inbound/rev/b73bcfde11ec

https://hg.mozilla.org/integration/mozilla-inbound/rev/24cf0be13b7126e3417f121dff0d6b5594aaf1cc Bug 1357673 - Fix try syntax tests r=dustin

By the way, that something it conflicted with was the same something, but in the interim it got backed out and re-landed :(