Rev 2215: merge dev in file:///home/mbp/bzr/Work/test_first/

Martin Pool mbp at sourcefrog.net
Wed Jan 17 01:47:06 GMT 2007


------------------------------------------------------------
revno: 2215
revision-id: mbp at sourcefrog.net-20070117014702-yjki61vdjsv3vztw
parent: mbp at sourcefrog.net-20070114065627-7p3bfihkti28j5fr
parent: pqm at pqm.ubuntu.com-20070116170721-bbe931a8978b7ce9
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: test_first
timestamp: Wed 2007-01-17 12:47:02 +1100
message:
  merge dev
added:
  bzrlib/tests/test_generate_docs.py test_generate_docs.p-20070102123151-cqctnsrlqwmiljd7-1
  bzrlib/tests/test_osutils_encodings.py test_osutils_encodin-20061226013130-kkp732tpt3lm91vv-1
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzr                            bzr.py-20050313053754-5485f144c7006fa6
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/help_topics.py          help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
  bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
  bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
  bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
  bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/symbol_versioning.py    symbol_versioning.py-20060105104851-9ecf8af605d15a80
  bzrlib/tests/HTTPTestUtil.py   HTTPTestUtil.py-20050914180604-247d3aafb7a43343
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/blackbox/test_bound_branches.py test_bound_branches.py-20051109215527-2373188ad566c205
  bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
  bzrlib/tests/blackbox/test_ls.py test_ls.py-20060712232047-0jraqpecwngee12y-1
  bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
  bzrlib/tests/branch_implementations/test_bound_sftp.py test_bound_sftp.py-20051231055311-2f96048c4f0940ef
  bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
  bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
  bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
  bzrlib/tests/test_inv.py       testinv.py-20050722220913-1dc326138d1a5892
  bzrlib/tests/test_nonascii.py  testnonascii.py-20051018022645-ea1d8b6477b058a6
  bzrlib/tests/test_options.py   testoptions.py-20051014093702-96457cfc86319a8f
  bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
  bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
  bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
  bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
  bzrlib/tests/test_symbol_versioning.py test_symbol_versioning.py-20060105104851-51d7722c2018d42b
  bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
  doc/configuration.txt          configuration.txt-20060314161707-868350809502af01
  setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
  tools/doc_generate/autodoc_man.py bzrman.py-20050601153041-0ff7f74de456d15e
  tools/doc_generate/autodoc_rstx.py autodoc_rstx.py-20060420024836-3e0d4a526452193c
  tools/win32/bzr.iss.cog        bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
    ------------------------------------------------------------
    revno: 2213.1.22
    merged: pqm at pqm.ubuntu.com-20070116170721-bbe931a8978b7ce9
    parent: pqm at pqm.ubuntu.com-20070115033134-6f456e8e9cc87f35
    parent: larstiq at larstiq.dyndns.org-20070116155653-aacs32wt8o3u0d2t
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2007-01-16 17:07:21 +0000
    message:
      (Wouter van Heyst) 0.14rc1 has branch, bump bzr.dev version to 0.15
        ------------------------------------------------------------
        revno: 2213.1.21.1.1
        merged: larstiq at larstiq.dyndns.org-20070116155653-aacs32wt8o3u0d2t
        parent: pqm at pqm.ubuntu.com-20070115033134-6f456e8e9cc87f35
        committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
        branch nick: bzr.dev
        timestamp: Tue 2007-01-16 16:56:53 +0100
        message:
          0.14rc1 has branch, bump bzr.dev version to 0.15
    ------------------------------------------------------------
    revno: 2213.1.21
    merged: pqm at pqm.ubuntu.com-20070115033134-6f456e8e9cc87f35
    parent: pqm at pqm.ubuntu.com-20070114053311-24541512d81bb5f2
    parent: bialix at ukr.net-20070113200038-ou53qsq5z0bt2gmn
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-01-15 03:31:34 +0000
    message:
      Python 2.5 fixes for win32 installer
        ------------------------------------------------------------
        revno: 2213.1.18.1.1
        merged: bialix at ukr.net-20070113200038-ou53qsq5z0bt2gmn
        parent: pqm at pqm.ubuntu.com-20070113174313-6733d2602d13a317
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: setup.fixes
        timestamp: Sat 2007-01-13 22:00:38 +0200
        message:
          Python 2.5 fixes for win32 installer
    ------------------------------------------------------------
    revno: 2213.1.20
    merged: pqm at pqm.ubuntu.com-20070114053311-24541512d81bb5f2
    parent: pqm at pqm.ubuntu.com-20070113203627-19221becd2626316
    parent: mbp at sourcefrog.net-20070114052115-r1m1xv3iood67m2q
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sun 2007-01-14 05:33:11 +0000
    message:
      (mbp) update global copyright to 2007 (trivial)
        ------------------------------------------------------------
        revno: 2213.1.19.1.1
        merged: mbp at sourcefrog.net-20070114052115-r1m1xv3iood67m2q
        parent: pqm at pqm.ubuntu.com-20070113203627-19221becd2626316
        committer: mbp at sourcefrog.net
        branch nick: trivial
        timestamp: Sun 2007-01-14 16:21:15 +1100
        message:
          update global copyright to 2007
    ------------------------------------------------------------
    revno: 2213.1.19
    merged: pqm at pqm.ubuntu.com-20070113203627-19221becd2626316
    parent: pqm at pqm.ubuntu.com-20070113174313-6733d2602d13a317
    parent: abentley at panoramicfeedback.com-20070111155749-v70rw01ug96bs1ll
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sat 2007-01-13 20:36:27 +0000
    message:
      Optimize iter_changes with specific file_ids
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.31
        merged: abentley at panoramicfeedback.com-20070111155749-v70rw01ug96bs1ll
        parent: abentley at panoramicfeedback.com-20070111151756-2nbmljlj1ixu1h4p
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Thu 2007-01-11 10:57:49 -0500
        message:
          Handle to_paths correctly when parent of file is not in specified_ids
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.30
        merged: abentley at panoramicfeedback.com-20070111151756-2nbmljlj1ixu1h4p
        parent: abentley at panoramicfeedback.com-20061222171136-0co49gz3hl5hx183
        parent: pqm at pqm.ubuntu.com-20070111014309-058f987c23817400
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Thu 2007-01-11 10:17:56 -0500
        message:
          Merge bzr.dev
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.29
        merged: abentley at panoramicfeedback.com-20061222171136-0co49gz3hl5hx183
        parent: abentley at panoramicfeedback.com-20061221212008-xwcgsfwa9jyrkmna
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Fri 2006-12-22 12:11:36 -0500
        message:
          Optimize Tree._iter_changes with specific file_ids
    ------------------------------------------------------------
    revno: 2213.1.18
    merged: pqm at pqm.ubuntu.com-20070113174313-6733d2602d13a317
    parent: pqm at pqm.ubuntu.com-20070111161229-759760c90ec737e6
    parent: larstiq at larstiq.dyndns.org-20070113171550-cn42jvozxsivu2bb
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sat 2007-01-13 17:43:13 +0000
    message:
      Restore (deprecated) access to SHORT_OPTIONS for compatibility.
        ------------------------------------------------------------
        revno: 2213.1.17.1.1
        merged: larstiq at larstiq.dyndns.org-20070113171550-cn42jvozxsivu2bb
        parent: pqm at pqm.ubuntu.com-20070111161229-759760c90ec737e6
        parent: mbp at sourcefrog.net-20070112035807-7b5caanb3y6b4r56
        committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
        branch nick: short-options
        timestamp: Sat 2007-01-13 18:15:50 +0100
        message:
          Merge work on SHORT_OPTIONS by Martin.
        ------------------------------------------------------------
        revno: 2213.1.14.1.5
        merged: mbp at sourcefrog.net-20070112035807-7b5caanb3y6b4r56
        parent: mbp at sourcefrog.net-20070112035212-rgjqu83owh9s5s2p
        committer: mbp at sourcefrog.net
        branch nick: options
        timestamp: Fri 2007-01-12 14:58:07 +1100
        message:
          doc cleanup
        ------------------------------------------------------------
        revno: 2213.1.14.1.4
        merged: mbp at sourcefrog.net-20070112035212-rgjqu83owh9s5s2p
        parent: mbp at sourcefrog.net-20070112034025-lxlybpp2qcxrs3py
        committer: mbp at sourcefrog.net
        branch nick: options
        timestamp: Fri 2007-01-12 14:52:12 +1100
        message:
          add test that legacy SHORT_OPTIONS really works, and set_short_name
        ------------------------------------------------------------
        revno: 2213.1.14.1.3
        merged: mbp at sourcefrog.net-20070112034025-lxlybpp2qcxrs3py
        parent: mbp at sourcefrog.net-20070111080821-yz6m2b1byj72jg0y
        committer: mbp at sourcefrog.net
        branch nick: options
        timestamp: Fri 2007-01-12 14:40:25 +1100
        message:
          Restore access to SHORT_OPTIONS for compatibility
        ------------------------------------------------------------
        revno: 2213.1.14.1.2
        merged: mbp at sourcefrog.net-20070111080821-yz6m2b1byj72jg0y
        parent: mbp at sourcefrog.net-20070110072857-mmf4qblq5u67jz0k
        committer: mbp at sourcefrog.net
        branch nick: options
        timestamp: Thu 2007-01-11 19:08:21 +1100
        message:
          Add a simple DeprecatedDict class
    ------------------------------------------------------------
    revno: 2213.1.17
    merged: pqm at pqm.ubuntu.com-20070111161229-759760c90ec737e6
    parent: pqm at pqm.ubuntu.com-20070111014309-058f987c23817400
    parent: john at arbash-meinel.com-20070111155741-ytnaog8q1mwz71u6
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-01-11 16:12:29 +0000
    message:
      (Vincent Ladeuil) Clean up TestCaseWithMemoryTransport
        ------------------------------------------------------------
        revno: 2213.1.16.1.1
        merged: john at arbash-meinel.com-20070111155741-ytnaog8q1mwz71u6
        parent: pqm at pqm.ubuntu.com-20070111014309-058f987c23817400
        parent: v.ladeuil+lp at free.fr-20070111084551-i00dpvj4161h421n
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Thu 2007-01-11 09:57:41 -0600
        message:
          (Vincent Ladeuil) Clean up TestCaseWithMemoryTransport
        ------------------------------------------------------------
        revno: 2213.1.14.2.2
        merged: v.ladeuil+lp at free.fr-20070111084551-i00dpvj4161h421n
        parent: v.ladeuil+lp at free.fr-20070110161134-w7cp18w3yby885d6
        committer: v.ladeuil+lp at free.fr
        branch nick: bzr.memory.tests
        timestamp: Thu 2007-01-11 09:45:51 +0100
        message:
          Cleanup.
          
          * bzrlib/tests/test_selftest.py:
          (TestTestCaseWithMemoryTransport.test_make_branch_and_memory_tree,
          TestTestCaseWithMemoryTransport.test_make_branch_and_memory_tree_with_format):
          Inline previous calls to fail[Unless|If]ExistsOnDisk and clearly
          explain their aim.
          
          * bzrlib/tests/__init__.py:
          (TestCaseWithMemoryTransport.failUnlessExistsOnDisk,
          TestCaseWithMemoryTransport.failIfExistsOnDisk): Deleted. They
          were more confusing than helpful.
          	
        ------------------------------------------------------------
        revno: 2213.1.14.2.1
        merged: v.ladeuil+lp at free.fr-20070110161134-w7cp18w3yby885d6
        parent: pqm at pqm.ubuntu.com-20070109142832-337c25188ea46f2d
        committer: v.ladeuil+lp at free.fr
        branch nick: bzr.memory.tests
        timestamp: Wed 2007-01-10 17:11:34 +0100
        message:
          Small fixes to test suite in the hope that it will facilitate the
          adoption of TestCaseWithMemoryTransport.
          
          * bzrlib/tests/test_selftest.py:
          (TestTestCaseWithMemoryTransport.test_make_branch_and_memory_tree,
          TestTestCaseWithMemoryTransport.test_make_branch_and_memory_tree_with_format)):
          Ensures that MemoryTransport is not leaking.
          
          * bzrlib/tests/__init__.py:
          (TestCaseWithMemoryTransport.failUnlessExistsOnDisk,
          TestCaseWithMemoryTransport.failIfExistsOnDisk): Renamed from
          failUnlessExists and failIfExists which should remain targeted at
          testing that a file do not exists in the context of the transport
          specific test.
          (TestCaseInTempDir.failUnlessExists,
          TestCaseInTempDir.failIfExists): Lazily maintain compatibility
          with existing tests: assumes that we work in the current directory
          *on disk*.
    ------------------------------------------------------------
    revno: 2213.1.16
    merged: pqm at pqm.ubuntu.com-20070111014309-058f987c23817400
    parent: pqm at pqm.ubuntu.com-20070110231047-dcd542463a35a2a8
    parent: mbp at sourcefrog.net-20070110072857-mmf4qblq5u67jz0k
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-01-11 01:43:09 +0000
    message:
      restore Option.short_name() to being callable (mbp, r=john, r=alexander)
        ------------------------------------------------------------
        revno: 2213.1.14.1.1
        merged: mbp at sourcefrog.net-20070110072857-mmf4qblq5u67jz0k
        parent: pqm at pqm.ubuntu.com-20070109142832-337c25188ea46f2d
        committer: mbp at sourcefrog.net
        branch nick: options
        timestamp: Wed 2007-01-10 18:28:57 +1100
        message:
          Back out previous incompatible change: Option.short_name is now again
          a method that returns the short name, if any.
    ------------------------------------------------------------
    revno: 2213.1.15
    merged: pqm at pqm.ubuntu.com-20070110231047-dcd542463a35a2a8
    parent: pqm at pqm.ubuntu.com-20070109142832-337c25188ea46f2d
    parent: bialix at ukr.net-20070110060149-5l6tkxfk19twivei
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2007-01-10 23:10:47 +0000
    message:
      (bialix) Fit output of 'bzr help' to 25 lines DOS console
        ------------------------------------------------------------
        revno: 2213.1.11.1.1
        merged: bialix at ukr.net-20070110060149-5l6tkxfk19twivei
        parent: pqm at pqm.ubuntu.com-20070104220107-4ecdf9355fdfbf9a
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: small.fixes
        timestamp: Wed 2007-01-10 08:01:49 +0200
        message:
          Fit output of 'bzr help' to 25 lines DOS console
    ------------------------------------------------------------
    revno: 2213.1.14
    merged: pqm at pqm.ubuntu.com-20070109142832-337c25188ea46f2d
    parent: pqm at pqm.ubuntu.com-20070109123444-619fc45c259a23c8
    parent: abentley at panoramicfeedback.com-20070109140826-3qm6nlgvbv5tp62c
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2007-01-09 14:28:32 +0000
    message:
      Tweak set_default_format
        ------------------------------------------------------------
        revno: 2204.4.13.1.2
        merged: abentley at panoramicfeedback.com-20070109140826-3qm6nlgvbv5tp62c
        parent: abentley at panoramicfeedback.com-20070109140630-6jyhehc4byeby0ui
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: format-registry
        timestamp: Tue 2007-01-09 09:08:26 -0500
        message:
          Tweak set_default_format
        ------------------------------------------------------------
        revno: 2204.4.13.1.1
        merged: abentley at panoramicfeedback.com-20070109140630-6jyhehc4byeby0ui
        parent: abentley at panoramicfeedback.com-20070105171203-uxlz2lhshbykbdin
        parent: pqm at pqm.ubuntu.com-20070109123444-619fc45c259a23c8
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: format-registry
        timestamp: Tue 2007-01-09 09:06:30 -0500
        message:
          Merge bzr.dev
    ------------------------------------------------------------
    revno: 2213.1.13
    merged: pqm at pqm.ubuntu.com-20070109123444-619fc45c259a23c8
    parent: pqm at pqm.ubuntu.com-20070105024018-b849a96645a25c39
    parent: aaron.bentley at utoronto.ca-20070109065743-n2g1jhbki8ta56d9
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2007-01-09 12:34:44 +0000
    message:
      Deprecate format type set_default methods
        ------------------------------------------------------------
        revno: 2204.4.14
        merged: aaron.bentley at utoronto.ca-20070109065743-n2g1jhbki8ta56d9
        parent: abentley at panoramicfeedback.com-20070105171203-uxlz2lhshbykbdin
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: format-registry
        timestamp: Tue 2007-01-09 01:57:43 -0500
        message:
          lastest -> latest
        ------------------------------------------------------------
        revno: 2204.4.13
        merged: abentley at panoramicfeedback.com-20070105171203-uxlz2lhshbykbdin
        parent: aaron.bentley at utoronto.ca-20070105070840-ku1kogdi0n2wfcqw
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: format-registry
        timestamp: Fri 2007-01-05 12:12:03 -0500
        message:
          Update all test cases to avoid set_default_format
        ------------------------------------------------------------
        revno: 2204.4.12
        merged: aaron.bentley at utoronto.ca-20070105070840-ku1kogdi0n2wfcqw
        parent: aaron.bentley at utoronto.ca-20070105063257-4t62uie9fb3i017j
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: format-registry
        timestamp: Fri 2007-01-05 02:08:40 -0500
        message:
          Deprecate bzrdir.BzrDirFormat.set_default_format
        ------------------------------------------------------------
        revno: 2204.4.11
        merged: aaron.bentley at utoronto.ca-20070105063257-4t62uie9fb3i017j
        parent: aaron.bentley at utoronto.ca-20070103021116-luxnkwbmoxa3j4au
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: format-registry
        timestamp: Fri 2007-01-05 01:32:57 -0500
        message:
          deprecate Repository.set_default_format, update upgrade tests
    ------------------------------------------------------------
    revno: 2213.1.12
    merged: pqm at pqm.ubuntu.com-20070105024018-b849a96645a25c39
    parent: pqm at pqm.ubuntu.com-20070104220107-4ecdf9355fdfbf9a
    parent: bialix at ukr.net-20070104233644-7znkxoj9b0y7ev28
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2007-01-05 02:40:18 +0000
    message:
      (bialix) Before actually using encoding need to check that Python
       has corresponding codec
        ------------------------------------------------------------
        revno: 2192.1.10
        merged: bialix at ukr.net-20070104233644-7znkxoj9b0y7ev28
        parent: bialix at ukr.net-20070104213543-4b0j8wuoapx8rcv8
        parent: pqm at pqm.ubuntu.com-20070104220107-4ecdf9355fdfbf9a
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: check-encoding
        timestamp: Fri 2007-01-05 01:36:44 +0200
        message:
          merge bzr.dev
        ------------------------------------------------------------
        revno: 2192.1.9
        merged: bialix at ukr.net-20070104213543-4b0j8wuoapx8rcv8
        parent: bialix at ukr.net-20070102212039-ohkta3peuykx18pr
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: check-encoding
        timestamp: Thu 2007-01-04 23:35:43 +0200
        message:
          final fix suggested by John Meinel
        ------------------------------------------------------------
        revno: 2192.1.8
        merged: bialix at ukr.net-20070102212039-ohkta3peuykx18pr
        parent: bialix at ukr.net-20070102160411-tkmtr5yzu7eha6w1
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: check-encoding
        timestamp: Tue 2007-01-02 23:20:39 +0200
        message:
          Rework tests after John's review
        ------------------------------------------------------------
        revno: 2192.1.7
        merged: bialix at ukr.net-20070102160411-tkmtr5yzu7eha6w1
        parent: bialix at ukr.net-20070102143236-68tf5imq1kybper4
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: check-encoding
        timestamp: Tue 2007-01-02 18:04:11 +0200
        message:
          get_user_encoding: if locale.Error raised we need to set user_encoding to 'ascii' as warning says
        ------------------------------------------------------------
        revno: 2192.1.6
        merged: bialix at ukr.net-20070102143236-68tf5imq1kybper4
        parent: bialix at ukr.net-20061226153559-f20mxxzikkqbfdw2
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: check-encoding
        timestamp: Tue 2007-01-02 16:32:36 +0200
        message:
          Fixes after Aaron's review
        ------------------------------------------------------------
        revno: 2192.1.5
        merged: bialix at ukr.net-20061226153559-f20mxxzikkqbfdw2
        parent: bialix at ukr.net-20061226153359-967kg97kdrtlsmve
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: check-encoding
        timestamp: Tue 2006-12-26 17:35:59 +0200
        message:
          NEWS
        ------------------------------------------------------------
        revno: 2192.1.4
        merged: bialix at ukr.net-20061226153359-967kg97kdrtlsmve
        parent: bialix at ukr.net-20061226152950-38ah5iveppgjvb6n
        parent: pqm at pqm.ubuntu.com-20061222180719-31fc1e7cbaf32a4b
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: check-encoding
        timestamp: Tue 2006-12-26 17:33:59 +0200
        message:
          merge bzr.dev
        ------------------------------------------------------------
        revno: 2192.1.3
        merged: bialix at ukr.net-20061226152950-38ah5iveppgjvb6n
        parent: bialix at ukr.net-20061226063503-h2flet6hzcogfbkx
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: check-encoding
        timestamp: Tue 2006-12-26 17:29:50 +0200
        message:
          Tests for osutils.get_user_encoding
        ------------------------------------------------------------
        revno: 2192.1.2
        merged: bialix at ukr.net-20061226063503-h2flet6hzcogfbkx
        parent: bialix at ukr.net-20061218080613-gw89j2qhwt5p6tb0
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: check-encoding
        timestamp: Tue 2006-12-26 08:35:03 +0200
        message:
          Tests for osutils.get_terminal_encoding()
        ------------------------------------------------------------
        revno: 2192.1.1
        merged: bialix at ukr.net-20061218080613-gw89j2qhwt5p6tb0
        parent: pqm at pqm.ubuntu.com-20061216093635-ef3d14265a8a8b6b
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: check-encoding
        timestamp: Mon 2006-12-18 10:06:13 +0200
        message:
          Before actually using encoding need to check that Python has corresponding codec
    ------------------------------------------------------------
    revno: 2213.1.11
    merged: pqm at pqm.ubuntu.com-20070104220107-4ecdf9355fdfbf9a
    parent: pqm at pqm.ubuntu.com-20070104215041-e2f73db439c71aa6
    parent: bialix at ukr.net-20070104013338-s56gyv5aippvif6f
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-01-04 22:01:07 +0000
    message:
      (bialix) fix typo in manpage generators (bugfix #76603)
        ------------------------------------------------------------
        revno: 2213.1.8.3.1
        merged: bialix at ukr.net-20070104013338-s56gyv5aippvif6f
        parent: pqm at pqm.ubuntu.com-20070103073947-f9906c0b1f425aa9
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: bugfix.76603
        timestamp: Thu 2007-01-04 03:33:38 +0200
        message:
          Bugfix #76603: fix typo in bzr manpage text
    ------------------------------------------------------------
    revno: 2213.1.10
    merged: pqm at pqm.ubuntu.com-20070104215041-e2f73db439c71aa6
    parent: pqm at pqm.ubuntu.com-20070104213903-ddc3293ca385e7a9
    parent: abentley at panoramicfeedback.com-20070104205946-fk5wxpb3bqoi3b7e
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-01-04 21:50:41 +0000
    message:
      Make most LockErrors internal
        ------------------------------------------------------------
        revno: 2213.1.8.2.2
        merged: abentley at panoramicfeedback.com-20070104205946-fk5wxpb3bqoi3b7e
        parent: abentley at panoramicfeedback.com-20070104202328-tl50qdeut094l3vh
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: internalerror
        timestamp: Thu 2007-01-04 15:59:46 -0500
        message:
          PEP8-correctness
        ------------------------------------------------------------
        revno: 2213.1.8.2.1
        merged: abentley at panoramicfeedback.com-20070104202328-tl50qdeut094l3vh
        parent: pqm at pqm.ubuntu.com-20070103073947-f9906c0b1f425aa9
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: internalerror
        timestamp: Thu 2007-01-04 15:23:28 -0500
        message:
          Make most lock errors internal
    ------------------------------------------------------------
    revno: 2213.1.9
    merged: pqm at pqm.ubuntu.com-20070104213903-ddc3293ca385e7a9
    parent: pqm at pqm.ubuntu.com-20070103073947-f9906c0b1f425aa9
    parent: john at arbash-meinel.com-20070104200616-5c09warmkqcgcbar
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-01-04 21:39:03 +0000
    message:
      (James Henstridge) Don't rely on time.timezone and time.altzone, since they are not always updated properly.
        ------------------------------------------------------------
        revno: 2213.1.8.1.1
        merged: john at arbash-meinel.com-20070104200616-5c09warmkqcgcbar
        parent: pqm at pqm.ubuntu.com-20070103073947-f9906c0b1f425aa9
        parent: james at jamesh.id.au-20070104104555-6ffbz0z2ywkfspk1
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Thu 2007-01-04 14:06:16 -0600
        message:
          (James Henstridge) Don't rely on time.timezone and time.altzone, since they are not always updated properly.
        ------------------------------------------------------------
        revno: 2213.1.2.6.3
        merged: james at jamesh.id.au-20070104104555-6ffbz0z2ywkfspk1
        parent: james at jamesh.id.au-20070102084032-se8cqzt2yg2bnpsn
        committer: James Henstridge <james at jamesh.id.au>
        branch nick: bzr.smallfixes (James Henstridge)
        timestamp: Thu 2007-01-04 19:45:55 +0900
        message:
          narrow the range that the local_time_offset() test uses
        ------------------------------------------------------------
        revno: 2213.1.2.6.2
        merged: james at jamesh.id.au-20070102084032-se8cqzt2yg2bnpsn
        parent: james at jamesh.id.au-20070101213631-kq9gl0ltvmpm12y0
        committer: James Henstridge <james at jamesh.id.au>
        branch nick: bzr.smallfixes (James Henstridge)
        timestamp: Tue 2007-01-02 17:40:32 +0900
        message:
          add some simple tests for local_time_offset()
        ------------------------------------------------------------
        revno: 2213.1.2.6.1
        merged: james at jamesh.id.au-20070101213631-kq9gl0ltvmpm12y0
        parent: pqm at pqm.ubuntu.com-20061222180719-31fc1e7cbaf32a4b
        committer: James Henstridge <james at jamesh.id.au>
        branch nick: bzr.smallfixes (James Henstridge)
        timestamp: Tue 2007-01-02 06:36:31 +0900
        message:
          Don't rely on time.timezone and time.altzone in local_time_offset(), 
          since they may not be accurate or applicable to the given timestamp (see 
          bug 77588).
          
          Instead, use the datetime module to find the difference between the 
          local time representation and UTC time representation of the timestamp.
    ------------------------------------------------------------
    revno: 2213.1.8
    merged: pqm at pqm.ubuntu.com-20070103073947-f9906c0b1f425aa9
    parent: pqm at pqm.ubuntu.com-20070103022432-334b367262bc7407
    parent: bialix at ukr.net-20070102124019-0qknbaxgbdxnkfhb
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2007-01-03 07:39:47 +0000
    message:
      (bialix) Fix generation of rstx man page
        ------------------------------------------------------------
        revno: 2213.1.2.5.1
        merged: bialix at ukr.net-20070102124019-0qknbaxgbdxnkfhb
        parent: pqm at pqm.ubuntu.com-20061222180719-31fc1e7cbaf32a4b
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: bzr_man.rstx
        timestamp: Tue 2007-01-02 14:40:19 +0200
        message:
          Fix generation of rstx man page (problem with short names of options) and provide simple tests for future.
    ------------------------------------------------------------
    revno: 2213.1.7
    merged: pqm at pqm.ubuntu.com-20070103022432-334b367262bc7407
    parent: pqm at pqm.ubuntu.com-20070103015524-b3c9e901a96b16a2
    parent: aaron.bentley at utoronto.ca-20070103021116-luxnkwbmoxa3j4au
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2007-01-03 02:24:32 +0000
    message:
      Register bzrdir formats ina FormatRegistry
        ------------------------------------------------------------
        revno: 2204.4.10
        merged: aaron.bentley at utoronto.ca-20070103021116-luxnkwbmoxa3j4au
        parent: aaron.bentley at utoronto.ca-20070103020952-tu2cap8tn7cbnq0f
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: format-registry
        timestamp: Tue 2007-01-02 21:11:16 -0500
        message:
          Capitalize 'D' in 'directory formats'
        ------------------------------------------------------------
        revno: 2204.4.9
        merged: aaron.bentley at utoronto.ca-20070103020952-tu2cap8tn7cbnq0f
        parent: aaron.bentley at utoronto.ca-20070103020633-0mrbo28n4m1t6zs7
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: format-registry
        timestamp: Tue 2007-01-02 21:09:52 -0500
        message:
          Update NEWS
        ------------------------------------------------------------
        revno: 2204.4.8
        merged: aaron.bentley at utoronto.ca-20070103020633-0mrbo28n4m1t6zs7
        parent: aaron.bentley at utoronto.ca-20061221043442-x3mv0kxnsu7c2z5j
        parent: pqm at pqm.ubuntu.com-20070103015524-b3c9e901a96b16a2
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: format-registry
        timestamp: Tue 2007-01-02 21:06:33 -0500
        message:
          Merge bzr.dev
        ------------------------------------------------------------
        revno: 2204.4.7
        merged: aaron.bentley at utoronto.ca-20061221043442-x3mv0kxnsu7c2z5j
        parent: aaron.bentley at utoronto.ca-20061221035631-07w2sshdphu5e2nj
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: format-registry
        timestamp: Wed 2006-12-20 23:34:42 -0500
        message:
          restore register_lazy, remove register_factory, other updates
        ------------------------------------------------------------
        revno: 2204.4.6
        merged: aaron.bentley at utoronto.ca-20061221035631-07w2sshdphu5e2nj
        parent: abentley at panoramicfeedback.com-20061220175027-xidxkp8obvtst7f1
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: format-registry
        timestamp: Wed 2006-12-20 22:56:31 -0500
        message:
          Fix default to work with RepositoryFormat.set_default_format
        ------------------------------------------------------------
        revno: 2204.4.5
        merged: abentley at panoramicfeedback.com-20061220175027-xidxkp8obvtst7f1
        parent: abentley at panoramicfeedback.com-20061220174936-wqbl93ph73bc9lxg
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: format-registry
        timestamp: Wed 2006-12-20 12:50:27 -0500
        message:
          Punctuation
        ------------------------------------------------------------
        revno: 2204.4.4
        merged: abentley at panoramicfeedback.com-20061220174936-wqbl93ph73bc9lxg
        parent: abentley at panoramicfeedback.com-20061220170314-0a33ljwxcivnkfwi
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: format-registry
        timestamp: Wed 2006-12-20 12:49:36 -0500
        message:
          Use BzrDirFormatInfo to distinguish native and deprecated formats
        ------------------------------------------------------------
        revno: 2204.4.3
        merged: abentley at panoramicfeedback.com-20061220170314-0a33ljwxcivnkfwi
        parent: abentley at panoramicfeedback.com-20061220165754-28utjxr508beexkc
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: format-registry
        timestamp: Wed 2006-12-20 12:03:14 -0500
        message:
          Reimplement get_format_type in terms of FormatRegistry
        ------------------------------------------------------------
        revno: 2204.4.2
        merged: abentley at panoramicfeedback.com-20061220165754-28utjxr508beexkc
        parent: abentley at panoramicfeedback.com-20061220163858-zwom59l3xvcqu2yd
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: format-registry
        timestamp: Wed 2006-12-20 11:57:54 -0500
        message:
          Tweak topic appearance
        ------------------------------------------------------------
        revno: 2204.4.1
        merged: abentley at panoramicfeedback.com-20061220163858-zwom59l3xvcqu2yd
        parent: pqm at pqm.ubuntu.com-20061220110444-a991704cfe50d2b3
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: format-registry
        timestamp: Wed 2006-12-20 11:38:58 -0500
        message:
          Add 'formats' help topic
    ------------------------------------------------------------
    revno: 2213.1.6
    merged: pqm at pqm.ubuntu.com-20070103015524-b3c9e901a96b16a2
    parent: pqm at pqm.ubuntu.com-20070102225630-e2bbb87a8d1151bf
    parent: bialix at ukr.net-20070103002345-7guxku60a0vwsoya
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2007-01-03 01:55:24 +0000
    message:
      (bialix) Bugfix #68124: Allow import plugins from zip archives
        ------------------------------------------------------------
        revno: 2213.1.2.4.3
        merged: bialix at ukr.net-20070103002345-7guxku60a0vwsoya
        parent: bialix at ukr.net-20070103002224-610ykoqgttlin7bh
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: plugins.from.zips
        timestamp: Wed 2007-01-03 02:23:45 +0200
        message:
          Don't use os.path.split and os.path.splitext directly, only from osutils.
          
          Because only '/' is used as separator of pathname components inside zip archives,
          bzrlib.plugin.load_from_zips() uses custom split algorithm for handling filenames 
          to import from zip.
        ------------------------------------------------------------
        revno: 2213.1.2.4.2
        merged: bialix at ukr.net-20070103002224-610ykoqgttlin7bh
        parent: bialix at ukr.net-20061229075317-uizaktke7o25g1z4
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: plugins.from.zips
        timestamp: Wed 2007-01-03 02:22:24 +0200
        message:
          split and splitext now the part of osutils
        ------------------------------------------------------------
        revno: 2213.1.2.4.1
        merged: bialix at ukr.net-20061229075317-uizaktke7o25g1z4
        parent: pqm at pqm.ubuntu.com-20061222180719-31fc1e7cbaf32a4b
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: plugins.from.zips
        timestamp: Fri 2006-12-29 09:53:17 +0200
        message:
          Bugfix #68124: Allow plugins import from zip archives.
    ------------------------------------------------------------
    revno: 2213.1.5
    merged: pqm at pqm.ubuntu.com-20070102225630-e2bbb87a8d1151bf
    parent: pqm at pqm.ubuntu.com-20070102201016-ce62560cd118fd90
    parent: abentley at panoramicfeedback.com-20070102155827-0iel8n3ox02vn4jf
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2007-01-02 22:56:30 +0000
    message:
      Allow ls to take a PATH
        ------------------------------------------------------------
        revno: 2213.1.2.3.1
        merged: abentley at panoramicfeedback.com-20070102155827-0iel8n3ox02vn4jf
        parent: pqm at pqm.ubuntu.com-20061222180719-31fc1e7cbaf32a4b
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: ls
        timestamp: Tue 2007-01-02 10:58:27 -0500
        message:
          Allow ls to take a PATH
    ------------------------------------------------------------
    revno: 2213.1.4
    merged: pqm at pqm.ubuntu.com-20070102201016-ce62560cd118fd90
    parent: pqm at pqm.ubuntu.com-20070102193519-9ebdc059abfd7993
    parent: john at arbash-meinel.com-20070102195305-rj3azf8s5jhe2d5c
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2007-01-02 20:10:16 +0000
    message:
      (James Henstridge) update doc/configuration.txt with info about config variable policies.
        ------------------------------------------------------------
        revno: 2213.1.3.1.1
        merged: john at arbash-meinel.com-20070102195305-rj3azf8s5jhe2d5c
        parent: pqm at pqm.ubuntu.com-20070102193519-9ebdc059abfd7993
        parent: james at jamesh.id.au-20070102071627-w5w976vfetuejhck
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Tue 2007-01-02 13:53:05 -0600
        message:
          (James Henstridge) update doc/configuration.txt with info about config variable policies.
        ------------------------------------------------------------
        revno: 2120.6.14
        merged: james at jamesh.id.au-20070102071627-w5w976vfetuejhck
        parent: james at jamesh.id.au-20070101091325-lndi83gpd6tb1ak4
        committer: James Henstridge <james at jamesh.id.au>
        branch nick: bzr.config-policy
        timestamp: Tue 2007-01-02 16:16:27 +0900
        message:
          Fix RST syntax as suggested by j-a-meinel
        ------------------------------------------------------------
        revno: 2120.6.13
        merged: james at jamesh.id.au-20070101091325-lndi83gpd6tb1ak4
        parent: james at jamesh.id.au-20070101073912-elq1bllgxfuh3cbj
        committer: James Henstridge <james at jamesh.id.au>
        branch nick: bzr.config-policy
        timestamp: Mon 2007-01-01 18:13:25 +0900
        message:
          update doc/configuration.txt with information about policies
        ------------------------------------------------------------
        revno: 2120.6.12
        merged: james at jamesh.id.au-20070101073912-elq1bllgxfuh3cbj
        parent: james at jamesh.id.au-20061207154536-dlb8iffz100euegp
        parent: pqm at pqm.ubuntu.com-20061222180719-31fc1e7cbaf32a4b
        committer: James Henstridge <james at jamesh.id.au>
        branch nick: bzr.config-policy
        timestamp: Mon 2007-01-01 16:39:12 +0900
        message:
          merge from bzr.dev
    ------------------------------------------------------------
    revno: 2213.1.3
    merged: pqm at pqm.ubuntu.com-20070102193519-9ebdc059abfd7993
    parent: pqm at pqm.ubuntu.com-20061222180719-31fc1e7cbaf32a4b
    parent: john at arbash-meinel.com-20070102191824-bsvgwgzypzfms6jq
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2007-01-02 19:35:19 +0000
    message:
      (Vincent Ladeuil) Fix proxy issues with earlier python versions.
        ------------------------------------------------------------
        revno: 2213.1.2.1.2
        merged: john at arbash-meinel.com-20070102191824-bsvgwgzypzfms6jq
        parent: john at arbash-meinel.com-20070102174712-c5rcvxyej2ylzfyf
        parent: robey at lag.net-20061227005009-pne1tyoju0gvqlqs
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Tue 2007-01-02 13:18:24 -0600
        message:
          (Robey Pointer) raise PathNotChild if the sftp transport is given a non-sftp url
            ------------------------------------------------------------
            revno: 2213.1.2.2.1
            merged: robey at lag.net-20061227005009-pne1tyoju0gvqlqs
            parent: pqm at pqm.ubuntu.com-20061222180719-31fc1e7cbaf32a4b
            committer: Robey Pointer <robey at lag.net>
            branch nick: bzr.dev.quickfix
            timestamp: Tue 2006-12-26 19:50:09 -0500
            message:
              raise PathNotChild if the sftp transport is given a non-sftp url
        ------------------------------------------------------------
        revno: 2213.1.2.1.1
        merged: john at arbash-meinel.com-20070102174712-c5rcvxyej2ylzfyf
        parent: pqm at pqm.ubuntu.com-20061222180719-31fc1e7cbaf32a4b
        parent: v.ladeuil+lp at free.fr-20061222095452-fmuqmnmokmsxeiqu
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Tue 2007-01-02 11:47:12 -0600
        message:
          (Vincent Ladeuil) Fix proxy issues with earlier python versions.
        ------------------------------------------------------------
        revno: 2213.2.1
        merged: v.ladeuil+lp at free.fr-20061222095452-fmuqmnmokmsxeiqu
        parent: pqm at pqm.ubuntu.com-20061222013706-0e1cb801c2e0ec9d
        committer: v.ladeuil+lp at free.fr
        branch nick: bzr.translate.path
        timestamp: Fri 2006-12-22 10:54:52 +0100
        message:
          Workaround SimpleHTTPRequestHandler.translate_path limitation in
          python 2.4.1
          
          * bzrlib/tests/HTTPTestUtil.py:
          (FakeProxyRequestHandler.do_GET): Work around a limitation of
          SimpleHTTPRequestHandler.translate_path in python 2.4.1 (fixed in
          2.4.3).
    ------------------------------------------------------------
    revno: 2213.1.2
    merged: pqm at pqm.ubuntu.com-20061222180719-31fc1e7cbaf32a4b
    parent: pqm at pqm.ubuntu.com-20061222171155-51bfebf386004ed0
    parent: bialix at ukr.net-20061222085830-k57n03cw3613dlhq
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2006-12-22 18:07:19 +0000
    message:
      (bialix) several small fixes to selftest
        ------------------------------------------------------------
        revno: 2204.3.4
        merged: bialix at ukr.net-20061222085830-k57n03cw3613dlhq
        parent: bialix at ukr.net-20061222085228-fe80nuencvxluh6v
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: selftest.fixes
        timestamp: Fri 2006-12-22 10:58:30 +0200
        message:
          Command 'selftest' use 'replace' encoding_type to prevent sudden traceback 
          if some test try to print unicode characters.
          
          Actually tests never should try to print unicode, even formatting
          unicode strings with '%s'. But if this happens selftest should not 
          blow-up with UnicodeEncodeError traceback.
        ------------------------------------------------------------
        revno: 2204.3.3
        merged: bialix at ukr.net-20061222085228-fe80nuencvxluh6v
        parent: bialix at ukr.net-20061221151519-rl8q1d5bt7973oqp
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: selftest.fixes
        timestamp: Fri 2006-12-22 10:52:28 +0200
        message:
          Don't formats unicode strings in test error messages with '%s': it's unsafe
        ------------------------------------------------------------
        revno: 2204.3.2
        merged: bialix at ukr.net-20061221151519-rl8q1d5bt7973oqp
        parent: bialix at ukr.net-20061221150241-sr5iue77tiod600e
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: selftest.fixes
        timestamp: Thu 2006-12-21 17:15:19 +0200
        message:
          cherrypicking: test_plugin_help_shows_plugin: fix cleanup after test
        ------------------------------------------------------------
        revno: 2204.3.1
        merged: bialix at ukr.net-20061221150241-sr5iue77tiod600e
        parent: pqm at pqm.ubuntu.com-20061220110444-a991704cfe50d2b3
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: regression
        timestamp: Thu 2006-12-21 17:02:41 +0200
        message:
          fix win32 selftest regression introduced by bzr.dev.revno2198
    ------------------------------------------------------------
    revno: 2213.1.1
    merged: pqm at pqm.ubuntu.com-20061222171155-51bfebf386004ed0
    parent: pqm at pqm.ubuntu.com-20061222013706-0e1cb801c2e0ec9d
    parent: abentley at panoramicfeedback.com-20061221212008-xwcgsfwa9jyrkmna
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2006-12-22 17:11:55 +0000
    message:
      ls now takes --show-ids
    ------------------------------------------------------------
    revno: 1551.2.49.1.40.1.22.1.42.1.28
    merged: abentley at panoramicfeedback.com-20061221212008-xwcgsfwa9jyrkmna
    parent: abentley at panoramicfeedback.com-20061221211145-ammv6t2g18phubcl
    parent: pqm at pqm.ubuntu.com-20061221204334-f206a0f736499cc8
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Thu 2006-12-21 16:20:08 -0500
    message:
      Merge bzr.dev
    ------------------------------------------------------------
    revno: 1551.2.49.1.40.1.22.1.42.1.27
    merged: abentley at panoramicfeedback.com-20061221211145-ammv6t2g18phubcl
    parent: abentley at panoramicfeedback.com-20061221202052-cisso7ouydlb0mbd
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Thu 2006-12-21 16:11:45 -0500
    message:
      Implement show-ids for all output formats
    ------------------------------------------------------------
    revno: 1551.2.49.1.40.1.22.1.42.1.26
    merged: abentley at panoramicfeedback.com-20061221202052-cisso7ouydlb0mbd
    parent: abentley at panoramicfeedback.com-20061220221844-95io021dwz80623b
    parent: pqm at pqm.ubuntu.com-20061220185255-86cd0a40a9c2e76e
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Thu 2006-12-21 15:20:52 -0500
    message:
      Merge bzr.dev

Diff too large for email (3190, the limit is 1000).



More information about the bazaar-commits mailing list