Merge lp:~lifeless/testtools/388322 into lp:~testtools-committers/testtools/trunk

Proposed by Robert Collins
Status: Merged
Approved by: Jonathan Lange
Approved revision: 19
Merged at revision: not available
Proposed branch: lp:~lifeless/testtools/388322
Merge into: lp:~testtools-committers/testtools/trunk
Diff against target: 56 lines
2 files modified
HACKING (+32/-0)
NEWS (+10/-0)
To merge this branch: bzr merge lp:~lifeless/testtools/388322
Reviewer Review Type Date Requested Status
Jonathan Lange Approve
Review via email: mp+13938@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Robert Collins (lifeless) wrote :

Project meta cleanups: setup.py executable, multiple committers in HACKING, NEWS file created.

Revision history for this message
Jonathan Lange (jml) wrote :

Yay.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'HACKING'
2--- HACKING 2008-10-04 03:51:34 +0000
3+++ HACKING 2009-10-26 08:55:20 +0000
4@@ -49,3 +49,35 @@
5 Tests belong in ``testtools/tests/``.
6
7
8+Commiting to trunk
9+------------------
10+
11+Testtools is maintained using bzr, with its trunk at lp:testtools. This gives
12+every contributor the ability to commit their work to their own branches.
13+However permission must be granted to allow contributors to commit to the trunk
14+branch.
15+
16+Commit access to trunk is obtained by joining the testtools-devs Launchpad
17+team. Membership in this team is contingent on obeying the testtools
18+contribution policy, including assigning copyright of all the work one creates
19+and places in trunk to Jonathan Lange.
20+
21+
22+Code Review
23+-----------
24+
25+All code must be reviewed before landing on trunk. The process is to create a
26+branch in launchpad, and submit it for merging to lp:testtools. It will then
27+be reviewed before it can be merged to trunk. It will be reviewed by someone:
28+ * not the author
29+ * a committer (member of the testtools-devs team)
30+
31+As a special exception, while the testtools committers team is small and prone
32+to blocking, a merge request from a committer that has not been reviewed after
33+24 hours may be merged by that committer. When the team is larger this policy
34+will be revisited.
35+
36+Code reviewers should look for the quality of what is being submitted,
37+including conformance with this HACKING file.
38+
39+Changes which all users should be made aware of should be documented in NEWS.
40
41=== added file 'NEWS'
42--- NEWS 1970-01-01 00:00:00 +0000
43+++ NEWS 2009-10-26 08:55:20 +0000
44@@ -0,0 +1,10 @@
45+testtools NEWS
46+==============
47+
48+0.0.2 (Inv development)
49+~~~~~~~~~~~~~~~~~~~~~~~
50+
51+Improvements
52+------------
53+
54+* Compatible with Python 2.6
55
56=== modified file 'setup.py' (properties changed: -x to +x)

Subscribers

People subscribed via source and target branches