https://bugzilla.wikimedia.org/show_bug.cgi?id=25406

           Summary: Cruise control is borked
           Product: Wikimedia
           Version: unspecified
          Platform: All
        OS/Version: All
            Status: NEW
          Severity: normal
          Priority: Normal
         Component: Site requests
        AssignedTo: m...@everybody.org
        ReportedBy: s...@reedyboy.net


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

-- 
Configure bugmail: https://bugzilla.wikimedia.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.

_______________________________________________
Wikibugs-l mailing list
Wikibugs-l@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/wikibugs-l

Reply via email to