Merge lp:~statik/statik/tarmac1 into lp:statik

[Elliot Murphy]

[Elliot Murphy (statik)]

This is a test, of course.

[Elliot Murphy (statik)]

Commit message: This is a test commit message.

[Elliot Murphy (statik)]

review: Approve

=== added file 'Makefile'
--- Makefile	1970-01-01 00:00:00 +0000
+++ Makefile	2009-03-05 02:22:12 +0000
@@ -0,0 +1,8 @@
+TESTFLAGS=
+test:
+	trial $(TESTFLAGS) tarmac
+
+test-fail:
+	trial this-will-fail
+
+.PHONY: test test-fail
 
=== modified file 'tarmac/bin.py'
--- tarmac/bin.py	2009-03-05 01:21:01 +0000
+++ tarmac/bin.py	2009-03-05 02:22:12 +0000
@@ -103,6 +103,7 @@
             if retcode == 0:
                 # TODO: It would be very nice if the commit message included
                 # some reference to the people who voted approve.
-                target_tree.commit(commit_message)
+                print 'would have committed'
+                #target_tree.commit(commit_message)
             else:
                 target_tree.revert()