Merge lp://staging/~mayankjuneja/systers/review-testing into lp://staging/~systers-dev/systers/development
Proposed by
Mayank Juneja
Status: | Needs review |
---|---|
Proposed branch: | lp://staging/~mayankjuneja/systers/review-testing |
Merge into: | lp://staging/~systers-dev/systers/development |
Diff against target: |
45 lines (+5/-6) 4 files modified
Mailman/DlistMemberships.py (+1/-1) Mailman/DlistUtils.py (+0/-5) Mailman/ListAdmin.py (+3/-0) Mailman/dummy_file.py (+1/-0) |
To merge this branch: | bzr merge lp://staging/~mayankjuneja/systers/review-testing |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Emanuel Danci | Disapprove | ||
Mayank Juneja | Disapprove | ||
Sneha Priscilla | Disapprove | ||
S Jake | mentor | Needs Information | |
Robin J | Disapprove | ||
Ana Cutillas | Pending | ||
Jennifer Redman | Pending | ||
Review via email: mp+108465@code.staging.launchpad.net |
To post a comment you must log in.
Unmerged revisions
- 83. By root <email address hidden>
-
test commit for code review
=== modified file 'Mailman/ DlistMembership s.py' DlistMembership s.py 2009-08-23 16:58:30 +0000 DlistMembership s.py 2012-06-02 18:11:19 +0000
--- Mailman/
+++ Mailman/
@@ -11,7 +11,7 @@
from Mailman import MemberAdaptor
#from mm_cfg import DEBUG_MODE
-ISREGULAR = 1 MODIFIED= 1
+ISREGULAR_
ISDIGEST = 2
Isn't there a conflict between ISREGULAR_MODIFIED = 1 and ISDIGEST=2? how can both be true?
This is an example of changing a line. It shows as a delete and an add
=== modified file 'Mailman/ DlistUtils. py' DlistUtils. py 2010-05-27 18:01:32 +0000 DlistUtils. py 2012-06-02 18:11:19 +0000
mlist. Unlock( )
--- Mailman/
+++ Mailman/
@@ -848,8 +848,3 @@
if alreadyLocked == 0:
-def remove_ dlist(listname) : database( listname)
- """ Deletes the corresponding postgres database and tables."""
- _remove_
- if DEBUG_MODE:
- syslog('info', "Database %s removed\n", listname)
One of my frustrations here is that I can't tell if you removed the entire function (it would be bad if you left the last line hanging around).
This is an example of removing lines
=== modified file 'Mailman/ ListAdmin. py' ListAdmin. py 2009-01-29 18:54:13 +0000 ListAdmin. py 2012-06-02 18:11:19 +0000 Logging. Syslog import syslog
--- Mailman/
+++ Mailman/
@@ -45,6 +45,9 @@
from Mailman.
from Mailman import i18n
+#Dummy additions
+import commands
+
The 3 lines above are what was added. Clear, but probably the use of the commands imported would be far away from this, and I would be confused by the time I got to it.
_ = i18n._
# Request types requiring admin approval
=== added file 'Mailman/ dummy_file. py' dummy_file. py 1970-01-01 00:00:00 +0000 dummy_file. py 2012-06-02 18:11:19 +0000
--- Mailman/
+++ Mailman/
@@ -0,0 +1,1 @@
+Dummy File
An empty (?) file was added (that is, it was checked into the branch, right?)