Statik

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

  1. tarmac1
  2. Merge into tarmac-trunk
Proposed by Elliot Murphy
Status: Merged
Approved by: Elliot Murphy
Approved revision: 50
Merged at revision: not available
Proposed branch: lp:~statik/statik/tarmac1
Merge into: lp:statik
Diff against target: None lines
To merge this branch: bzr merge lp:~statik/statik/tarmac1
Reviewer Review Type Date Requested Status
Elliot Murphy Approve
Review via email: mp+4178@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Elliot Murphy (statik) wrote :

This is a test, of course.

Revision history for this message
Elliot Murphy (statik) wrote :

Commit message: This is a test commit message.

Revision history for this message
Elliot Murphy (statik) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'Makefile'
2--- Makefile 1970-01-01 00:00:00 +0000
3+++ Makefile 2009-03-05 02:22:12 +0000
4@@ -0,0 +1,8 @@
5+TESTFLAGS=
6+test:
7+ trial $(TESTFLAGS) tarmac
8+
9+test-fail:
10+ trial this-will-fail
11+
12+.PHONY: test test-fail
13
14=== modified file 'tarmac/bin.py'
15--- tarmac/bin.py 2009-03-05 01:21:01 +0000
16+++ tarmac/bin.py 2009-03-05 02:22:12 +0000
17@@ -103,6 +103,7 @@
18 if retcode == 0:
19 # TODO: It would be very nice if the commit message included
20 # some reference to the people who voted approve.
21- target_tree.commit(commit_message)
22+ print 'would have committed'
23+ #target_tree.commit(commit_message)
24 else:
25 target_tree.revert()

Subscribers

People subscribed via source and target branches

to all changes: