Closed
Bug 967314
Opened 10 years ago
Closed 10 years ago
merge day problem, need to investigate
Categories
(Webtools Graveyard :: Elmo, defect)
Webtools Graveyard
Elmo
Tracking
(Not tracked)
RESOLVED
WORKSFORME
People
(Reporter: Pike, Unassigned)
Details
Here's what the log had for comm-beta: 2014-02-03 17:03:54-0600 [-] pulling from http://hg.mozilla.org/releases/comm-beta/ 2014-02-03 17:03:54-0600 [-] searching for changes 2014-02-03 17:03:54-0600 [-] adding changesets 2014-02-03 17:03:54-0600 [-] adding manifests 2014-02-03 17:03:54-0600 [-] adding file changes 2014-02-03 17:03:57-0600 [-] added 174 changesets with 556 changes to 401 files 2014-02-03 17:03:57-0600 [-] (run 'hg update' to get a working copy) 2014-02-03 17:03:57-0600 [-] Unhandled error in Deferred: 2014-02-03 17:03:57-0600 [-] Unhandled Error Traceback (most recent call last): File "/usr/lib/python2.6/dist-packages/twisted/internet/base.py", line 1170, in run self.mainLoop() File "/usr/lib/python2.6/dist-packages/twisted/internet/base.py", line 1179, in mainLoop self.runUntilCurrent() File "/usr/lib/python2.6/dist-packages/twisted/internet/base.py", line 778, in runUntilCurrent call.func(*call.args, **call.kw) File "/usr/lib/python2.6/dist-packages/twisted/internet/task.py", line 577, in _tick taskObj._oneWorkUnit() --- <exception caught here> --- File "/usr/lib/python2.6/dist-packages/twisted/internet/task.py", line 458, in _oneWorkUnit result = self._iterator.next() File "/home/dashboard/site/master-ball/twisted/plugins/pushes_plugin.py", line 170, in poll self.processPushes(pushes, repo) File "/home/dashboard/site/master-ball/twisted/plugins/pushes_plugin.py", line 239, in processPushes handlePushes(tips[0][0], submits, self.do_update) File "/home/dashboard/site/master-ball/vendor-local/django/db/transaction.py", line 217, in inner res = func(*args, **kwargs) File "/home/dashboard/site/master-ball/vendor-local/elmo/apps/pushes/utils.py", line 114, in handlePushes do_update=do_update) File "/home/dashboard/site/master-ball/vendor-local/elmo/apps/pushes/utils.py", line 168, in _hg_repository_sync update(ui_, hgrepo) File "/usr/local/lib/python2.6/dist-packages/mercurial/commands.py", line 5868, in update ret = hg.update(repo, rev) File "/usr/local/lib/python2.6/dist-packages/mercurial/hg.py", line 462, in update stats = updaterepo(repo, node, False) File "/usr/local/lib/python2.6/dist-packages/mercurial/hg.py", line 458, in updaterepo return mergemod.update(repo, node, False, overwrite, None) File "/usr/local/lib/python2.6/dist-packages/mercurial/merge.py", line 749, in update raise util.Abort(msg, hint=hint) mercurial.error.Abort: not a linear update It did have all the remote changeset, and I did a local update -c. Filing to keep track of this. Might be related to the hg update
Reporter | ||
Comment 1•10 years ago
|
||
Figured it out, I was running the poller without -n, so it tried to update the local repos, which fails on closed branches on merge day.
Status: NEW → RESOLVED
Closed: 10 years ago
Resolution: --- → WORKSFORME
Updated•4 years ago
|
Product: Webtools → Webtools Graveyard
You need to log in
before you can comment on or make changes to this bug.
Description
•