Rev 1855: (jam) minor cleanups, updates to NEWS for bug fixes. in /home/pqm/archives/thelove/bzr/+trunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Wed Jul 12 04:22:42 BST 2006


------------------------------------------------------------
revno: 1855
revision-id: pqm at pqm.ubuntu.com-20060712032241-2352b3ef35093aa1
parent: pqm at pqm.ubuntu.com-20060712031607-3662d1acc5a6c28d
parent: john at arbash-meinel.com-20060712024948-162ebe6b4b9985bf
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-07-12 04:22:41 +0100
message:
  (jam) minor cleanups, updates to NEWS for bug fixes.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/benchmarks/__init__.py  __init__.py-20060516064526-eb0d37c78e86065d
  bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
  bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060712024948-162ebe6b4b9985bf
    parent: john at arbash-meinel.com-20060712022725-81e49e7537b91f08
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Tue 2006-07-11 21:49:48 -0500
    message:
      Restore logging of full traceback. Helps with debugging tests.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060712022725-81e49e7537b91f08
    parent: john at arbash-meinel.com-20060711151703-b7998b945efbfdb2
    parent: pqm at pqm.ubuntu.com-20060711204542-8e872becb9b4caf9
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Tue 2006-07-11 21:27:25 -0500
    message:
      merge bzr.dev, cleanup NEWS
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060711151703-b7998b945efbfdb2
    parent: john at arbash-meinel.com-20060711150637-fcde274329795188
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Tue 2006-07-11 10:17:03 -0500
    message:
      Update NEWS for fixed bugs #50155, #41183, #42592
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060711150637-fcde274329795188
    parent: john at arbash-meinel.com-20060711144700-597a978cebc404de
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Tue 2006-07-11 10:06:37 -0500
    message:
      NEWS bug #5444
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060711144700-597a978cebc404de
    parent: john at arbash-meinel.com-20060711132429-1a2e959a5acb28b5
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Tue 2006-07-11 09:47:00 -0500
    message:
      minor fix from Jan Balster to get --benchmark to work again
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060711132429-1a2e959a5acb28b5
    parent: john at arbash-meinel.com-20060711132231-b250bd31162a8bea
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Tue 2006-07-11 08:24:29 -0500
    message:
      NEWS on bundle fix for bug #51927
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060711132231-b250bd31162a8bea
    parent: john at arbash-meinel.com-20060706162414-d0668a8c42c10d09
    parent: pqm at pqm.ubuntu.com-20060711002834-437bd17f804929ad
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Tue 2006-07-11 08:22:31 -0500
    message:
      [merge] bzr.dev 1850
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060706162414-d0668a8c42c10d09
    parent: john at arbash-meinel.com-20060706022726-769792485a0b6890
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Thu 2006-07-06 11:24:14 -0500
    message:
      Remove useless line from bzrlib/diff.py



More information about the bazaar-commits mailing list