Unity

Merge lp:~alexlauni/unity/tarmac into lp:unity

  1. tarmac
  2. Merge into trunk
Proposed by Alex Launi
Status: Merged
Approved by: Alex Launi
Approved revision: no longer in the source branch.
Merge reported by: Neil J. Patel
Merged at revision: not available
Proposed branch: lp:~alexlauni/unity/tarmac
Merge into: lp:unity
Diff against target: 6 lines (+1/-0)
1 file modified
ADDED_FILE (+1/-0)
To merge this branch: bzr merge lp:~alexlauni/unity/tarmac
Reviewer Review Type Date Requested Status
Alex Launi (community) Approve
Review via email: mp+39470@code.launchpad.net

Commit message

Added a fake file to commit a fake revision to propose a fake merge inside of a fake building.

Description of the change

Approving the merge for tarmac to test automatic landing with test running.

To post a comment you must log in.
Revision history for this message
Alex Launi (alexlauni) wrote :

Approving for tarmac to test automatic merging with test running.

review: Approve
Revision history for this message
Alex Launi (alexlauni) wrote :

The attempt to merge lp:~alexlauni/unity/tarmac into lp:unity failed. Below is the output from the failed tests.

make: *** No rule to make target `check'. Stop.

Revision history for this message
Alex Launi (alexlauni) wrote :

The attempt to merge lp:~alexlauni/unity/tarmac into lp:unity failed. Below is the output from the failed tests.

/bin/sh: ./autogen: not found
make: *** No rule to make target `check'. Stop.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'ADDED_FILE'
2--- ADDED_FILE 1970-01-01 00:00:00 +0000
3+++ ADDED_FILE 2010-10-27 19:49:59 +0000
4@@ -0,0 +1,1 @@
5+Worthless for testing tarmac
6\ No newline at end of file