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
=== modified file 'HACKING'
--- HACKING 2008-10-04 03:51:34 +0000
+++ HACKING 2009-10-26 08:55:20 +0000
@@ -49,3 +49,35 @@
49Tests belong in ``testtools/tests/``.49Tests belong in ``testtools/tests/``.
5050
5151
52Commiting to trunk
53------------------
54
55Testtools is maintained using bzr, with its trunk at lp:testtools. This gives
56every contributor the ability to commit their work to their own branches.
57However permission must be granted to allow contributors to commit to the trunk
58branch.
59
60Commit access to trunk is obtained by joining the testtools-devs Launchpad
61team. Membership in this team is contingent on obeying the testtools
62contribution policy, including assigning copyright of all the work one creates
63and places in trunk to Jonathan Lange.
64
65
66Code Review
67-----------
68
69All code must be reviewed before landing on trunk. The process is to create a
70branch in launchpad, and submit it for merging to lp:testtools. It will then
71be reviewed before it can be merged to trunk. It will be reviewed by someone:
72 * not the author
73 * a committer (member of the testtools-devs team)
74
75As a special exception, while the testtools committers team is small and prone
76to blocking, a merge request from a committer that has not been reviewed after
7724 hours may be merged by that committer. When the team is larger this policy
78will be revisited.
79
80Code reviewers should look for the quality of what is being submitted,
81including conformance with this HACKING file.
82
83Changes which all users should be made aware of should be documented in NEWS.
5284
=== added file 'NEWS'
--- NEWS 1970-01-01 00:00:00 +0000
+++ NEWS 2009-10-26 08:55:20 +0000
@@ -0,0 +1,10 @@
1testtools NEWS
2==============
3
40.0.2 (Inv development)
5~~~~~~~~~~~~~~~~~~~~~~~
6
7Improvements
8------------
9
10* Compatible with Python 2.6
011
=== modified file 'setup.py' (properties changed: -x to +x)

Subscribers

People subscribed via source and target branches