Rev 2082: (John Arbash Meinel) teach the pqm to require no warnings, and update remerge to not use iter_conflicts in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 2082
revision-id: pqm at pqm.ubuntu.com-20061016071810-36dcc90223d479b4
parent: pqm at pqm.ubuntu.com-20061016062419-2dedd03ba542aeb7
parent: john at arbash-meinel.com-20061016063832-1076fda126f4429e
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-10-16 08:18:10 +0100
message:
  (John Arbash Meinel) teach the pqm to require no warnings, and update remerge to not use iter_conflicts
modified:
  Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20061016063832-1076fda126f4429e
    parent: john at arbash-meinel.com-20061016063155-4ebed425a35c9adb
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: no-warnings
    timestamp: Mon 2006-10-16 16:38:32 +1000
    message:
      Teach the pqm to treat warnings as errors
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20061016063155-4ebed425a35c9adb
    parent: pqm at pqm.ubuntu.com-20061016050503-9caf9431977a6d0c
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: no-warnings
    timestamp: Mon 2006-10-16 16:31:55 +1000
    message:
      Make 'bzr remerge' not use deprecated WorkingTree.iter_conflicts