Last modified: 2010-10-03 22:42:01 UTC

Wikimedia Bugzilla is closed!

Wikimedia migrated from Bugzilla to Phabricator. Bug reports are handled in Wikimedia Phabricator.
This static website is read-only and for historical purposes. It is not possible to log in and except for displaying bug reports and their history, links might be broken. See T27406, the corresponding Phabricator task for complete and up-to-date bug report information.
First Last Prev Next    This bug is not in your last search results.
Bug 25406 - Cruise control is borked
Cruise control is borked
Status: RESOLVED FIXED
Product: Wikimedia
Classification: Unclassified
Site requests (Other open bugs)
unspecified
All All
: Normal normal (vote)
: ---
Assigned To: Mark A. Hershberger
:
Depends on:
Blocks:
  Show dependency tree / graph
 
Reported: 2010-10-03 20:42 UTC by Sam Reed (reedy)
Modified: 2010-10-03 22:42 UTC (History)
0 users

See Also:
Web browser: ---
Mobile Platform: ---
Assignee Huggle Beta Tester: ---

Attachments
Add an attachment (proposed patch, testcase, etc.)

Description Sam Reed (reedy) 2010-10-03 20:42:21 UTC 
Seemingly it sucks at doing svn merges (presumably repository should win?)

Conflict discovered in 'maintenance/tests/phpunit/includes/api/ApiSetup.php'.

Select: (p) postpone, (df) diff-full, (e) edit,

        (mc) mine-conflict, (tc) theirs-conflict,

        (s) show all options: svn: Can't read stdin: End of file found

PHP Fatal error:  Access to undeclared static property: ApiTest::$sysopUser in /home/ci/cruisecontrol-bin-2.8.3/projects/mw/source/maintenance/tests/phpunit/includes/api/ApiTest.php on line 95
Comment 1 Sam Reed (reedy) 2010-10-03 22:42:01 UTC 
<^demon> Well I do. What's borked? If you were referring to the svn conflict it was yelling about earlier, that was my fault and it's already fixed.
Note You need to log in before you can comment on or make changes to this bug.
First Last Prev Next    This bug is not in your last search results.

Navigation
Links