file_51395.txt
Public
Actions

Authored By

	• bzimport
	Nov 22 2014, 1:59 AM

Size

2 KB

Referenced Files

None

Subscribers

None

file_51395.txt
View Options

	2013-07-16 13:34:16,936 DEBUG zuul.Repo: Checking out master
	2013-07-16 13:34:16,982 DEBUG zuul.Repo: Merging refs/changes/46/70646/5
	2013-07-16 13:34:23,865 DEBUG zuul.Merger: Unable to merge <Change 0x7f3750118c10 70646,5>
	Traceback (most recent call last):
	File "/usr/local/lib/python2.7/dist-packages/zuul-ac3ba4f-py2.7.egg/zuul/merger.py", line 172, in _mergeChange
	repo.merge(change.refspec)
	File "/usr/local/lib/python2.7/dist-packages/zuul-ac3ba4f-py2.7.egg/zuul/merger.py", line 74, in merge
	self.repo.git.merge("FETCH_HEAD")
	File "/usr/lib/python2.7/dist-packages/git/cmd.py", line 227, in <lambda>
	return lambda args, kwargs: self._call_process(name, args, **kwargs)
	File "/usr/lib/python2.7/dist-packages/git/cmd.py", line 456, in _call_process
	return self.execute(call, **_kwargs)
	File "/usr/lib/python2.7/dist-packages/git/cmd.py", line 377, in execute
	raise GitCommandError(command, status, stderr_value)
	GitCommandError: 'git merge FETCH_HEAD' returned exit status 1:
	2013-07-16 13:34:23,904 INFO zuul.IndependentPipelineManager: Unable to merge change <Change 0x7f3750118c10 70646,5>
	2013-07-16 13:34:23,904 DEBUG zuul.IndependentPipelineManager: Possibly reporting change <Change 0x7f3750118c10 70646,5>
	2013-07-16 13:34:23,904 DEBUG zuul.IndependentPipelineManager: Change <Change 0x7f3750118c10 70646,5> is at the front of the queue, reporting
	2013-07-16 13:34:23,904 DEBUG zuul.IndependentPipelineManager: Reporting change <Change 0x7f3750118c10 70646,5>
	2013-07-16 13:34:23,904 INFO zuul.IndependentPipelineManager: Reporting change <Change 0x7f3750118c10 70646,5>, action: {'verified': -1, 'code-review': 0}
	2013-07-16 13:34:23,905 DEBUG zuul.Gerrit: Report change <Change 0x7f3750118c10 70646,5>, action {'verified': -1, 'code-review': 0}, message: Build failed.

	This change was unable to be automatically merged with the current state of the repository. Please rebase your change and upload a new patchset.
	2013-07-16 13:34:24,146 DEBUG zuul.IndependentPipelineManager: Removing reported change <Change 0x7f3750118c10 70646,5> from queue

File Metadata

Mime Type: text/plain
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 11020
Default Alt Text: file_51395.txt (2 KB)

file_51395.txtPublicActions

file_51395.txtView Options

File Metadata

Event Timeline

file_51395.txt
Public
Actions

file_51395.txt
View Options