Rev 1631: (olaf) fix resolve command in subdir; python logging shutdown in /home/pqm/archives/thelove/bzr/+trunk/

Wed Apr 12 09:29:26 BST 2006

------------------------------------------------------------
revno: 1631
revision-id: pqm at pqm.ubuntu.com-20060412082925-f1988a4619180117
parent: pqm at pqm.ubuntu.com-20060412062244-b1ea5860b8463060
parent: mbp at sourcefrog.net-20060412060637-11b65bc78d065a45
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-04-12 09:29:25 +0100
message:
  (olaf) fix resolve command in subdir; python logging shutdown
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/conflicts.py            conflicts.py-20051001061850-78ef952ba63d2b42
  bzrlib/tests/blackbox/test_conflicts.py test_conflicts.py-20060228151432-9723ebb925b999cf
  bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060412060637-11b65bc78d065a45
    parent: mbp at sourcefrog.net-20060412052713-25cda948d8e13f60
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.integration
    timestamp: Wed 2006-04-12 16:06:37 +1000
    message:
      Improved bzr resolve command line handling
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060412052713-25cda948d8e13f60
    parent: mbp at sourcefrog.net-20060412045202-5920585dfd719c7b
    parent: olaf at conradi.org-20060407115030-62841fc4321f5cb8
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.integration
    timestamp: Wed 2006-04-12 15:27:13 +1000
    message:
      Fix warning from Python logging after test suite finishes (olaf)
    ------------------------------------------------------------
    merged: olaf at conradi.org-20060407115030-62841fc4321f5cb8
    parent: olaf at conradi.org-20060406211721-64fb1d3832b1532c
    committer: Olaf Conradi <olaf at conradi.org>
    branch nick: bzr.olaf.logging
    timestamp: Fri 2006-04-07 13:50:30 +0200
    message:
      Remove extra flush before closing log handler.
    ------------------------------------------------------------
    merged: olaf at conradi.org-20060406211721-64fb1d3832b1532c
    parent: pqm at pqm.ubuntu.com-20060406115819-479ae52584747faa
    committer: Olaf Conradi <olaf at conradi.org>
    branch nick: bzr.dev
    timestamp: Thu 2006-04-06 23:17:21 +0200
    message:
      Close logging handler on disabling the test log. This will remove the
      handler from the internal list inside python's logging module,
      preventing shutdown from closing it twice.
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060412045202-5920585dfd719c7b
    parent: pqm at pqm.ubuntu.com-20060411084133-90aab62d72535e57
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.integration
    timestamp: Wed 2006-04-12 14:52:02 +1000
    message:
      Fix 'bzr resolve' run from subdirectory