Merge lp:~widelands-dev/widelands/test_merge into lp:widelands

Proposed by SirVer on 2017-08-06
Status: Rejected
Rejected by: SirVer on 2017-08-07
Proposed branch: lp:~widelands-dev/widelands/test_merge
Merge into: lp:widelands
Diff against target: 11 lines (+2/-0)
1 file modified
src/base/macros.h (+2/-0)
To merge this branch: bzr merge lp:~widelands-dev/widelands/test_merge
Reviewer Review Type Date Requested Status
Widelands Developers 2017-08-06 Pending
Review via email: mp+328636@code.launchpad.net

Commit Message

This is a test branch to check a refactoring of bunnybot. Please ignore.

Description of the Change

This is a test branch to check a refactoring of bunnybot. Please ignore.

To post a comment you must log in.
SirVer (sirver) wrote :

@bunnybot merge

bunnybot (widelandsofficial) wrote :

Fooo

bunnybot (widelandsofficial) wrote :

Fooo

SirVer (sirver) wrote :

@bunnybot merge

bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 2510. State: canceled. Details: https://travis-ci.org/widelands/widelands/builds/261757886.
Appveyor build 2334. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_test_merge-2334.

bunnybot (widelandsofficial) wrote :

Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways.

Travis build 2510. State: canceled. Details: https://travis-ci.org/widelands/widelands/builds/261757886.

Unmerged revisions

8413. By SirVer on 2017-08-06

Introduce compile time error.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/base/macros.h'
2--- src/base/macros.h 2017-07-01 20:32:02 +0000
3+++ src/base/macros.h 2017-08-06 21:16:27 +0000
4@@ -17,6 +17,8 @@
5 *
6 */
7
8+this is a syntax error.
9+
10 #ifndef WL_BASE_MACROS_H
11 #define WL_BASE_MACROS_H
12