Rev 2656: Revise text about voting to match current system in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 2656
revision-id: pqm at pqm.ubuntu.com-20070728003632-bxnvc9xfmvv9zeol
parent: pqm at pqm.ubuntu.com-20070727061532-14ly852y2g2dbcb8
parent: aaron.bentley at utoronto.ca-20070727054924-9352760504k84zhe
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-07-28 01:36:32 +0100
message:
  Revise text about voting to match current system
modified:
  doc/developers/HACKING         HACKING-20050805200004-2a5dc975d870f78c
    ------------------------------------------------------------
    revno: 2654.1.1
    merged: aaron.bentley at utoronto.ca-20070727054924-9352760504k84zhe
    parent: pqm at pqm.ubuntu.com-20070726223348-t2howycr63c04q7r
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzr.docs
    timestamp: Fri 2007-07-27 01:49:24 -0400
    message:
      Revise text about voting to match current system
=== modified file 'doc/developers/HACKING'
--- a/doc/developers/HACKING	2007-07-20 17:25:20 +0000
+++ b/doc/developers/HACKING	2007-07-27 05:49:24 +0000
@@ -149,19 +149,18 @@
 Anyone can "vote" on the mailing list. Core developers can also vote using
 Bundle Buggy. Here are the voting codes and their explanations.
 
-  -1	really don't want it in current form
-  -0	somewhat uncomfortable 
-  +0	comfortable but resubmission after changes requested
-  +1 conditional	good to go after some minor changes
-  +1	good to go
-
-+1 conditional is used as a way to avoid another submit/review cycle for
-patches that need small changes.
-
-If a change gets two +1 votes from core reviewers, and no
-vetos, then it's OK to come in.  Any of the core developers can bring it
-into the bzr.dev trunk and backport it to maintenance branches if required.
-The Release Manager will merge the change into the branch for a pending
+:approve:  Reviewer wants this submission merged.
+:tweak:    Reviewer wants this submission merged with small changes. (No
+  re-review required.)
+:abstain:  Reviewer does not intend to vote on this patch.
+:resubmit: Please make changes and resubmit for review.
+:reject:   Reviewer doesn't want this kind of change merged.
+:comment:  Not really a vote. Reviewer just wants to comment, for now.
+
+If a change gets two approvals from core reviewers, and no rejections,
+then it's OK to come in.  Any of the core developers can bring it into the
+bzr.dev trunk and backport it to maintenance branches if required.  The
+Release Manager will merge the change into the branch for a pending
 release, if any. As a guideline, core developers usually merge their own
 changes and volunteer to merge other contributions if they were the second
 reviewer to agree to a change.