Rev 1685: (mbp) merge 0.8 fixes; fix #32587 in /home/pqm/archives/thelove/bzr/+trunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Wed May 17 09:50:41 BST 2006


------------------------------------------------------------
revno: 1685
revision-id: pqm at pqm.ubuntu.com-20060517085040-ee6e33957c557fba
parent: pqm at pqm.ubuntu.com-20060517041517-124d83271af952bc
parent: mbp at sourcefrog.net-20060517084150-f618b89d118e3cc3
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-05-17 09:50:40 +0100
message:
  (mbp) merge 0.8 fixes; fix #32587
added:
  bzrlib/plugins/launchpad/      launchpad-20060516012834-b4258331967684d4
  bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
  bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
  bzrlib/plugins/launchpad/test_register.py test_register.py-20060315182712-40f5dda945c829a8
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
  bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
  bzrlib/msgeditor.py            msgeditor.py-20050901111708-ef6d8de98f5d8f2f
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
  bzrlib/tests/blackbox/test_ancestry.py test_ancestry.py-20060131142602-6d9524c490537e90
  bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
  bzrlib/tests/test_commit.py    test_commit.py-20050914060732-279f057f8c295434
  bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
  bzrlib/tests/test_inv.py       testinv.py-20050722220913-1dc326138d1a5892
  bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
  bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
  setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060517084150-f618b89d118e3cc3
    parent: mbp at sourcefrog.net-20060517070913-723e387ac91d55c0
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.integration
    timestamp: Wed 2006-05-17 18:41:50 +1000
    message:
      Remove duplicated TestLocationConfig and update previously hidden tests. (#32587)
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060517070913-723e387ac91d55c0
    parent: mbp at sourcefrog.net-20060517041635-bddf9ea599d8240e
    parent: mbp at sourcefrog.net-20060517040138-2cdf4e74bbc40afc
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.integration
    timestamp: Wed 2006-05-17 17:09:13 +1000
    message:
      merge 0.8 fix branch, including register-branch plugin
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060517040138-2cdf4e74bbc40afc
        parent: mbp at sourcefrog.net-20060516030208-70131d62053c0f1c
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr-0.8.mbp
        timestamp: Wed 2006-05-17 14:01:38 +1000
        message:
          Fix setup.py to install launchpad plugin
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060516030208-70131d62053c0f1c
        parent: mbp at sourcefrog.net-20060516025158-e17dd9ec3a7c1bf3
        parent: olaf at conradi.org-20060515225409-071211ddf818569a
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr-0.8.mbp
        timestamp: Tue 2006-05-16 13:02:08 +1000
        message:
          merge olaf - InvalidRevisionId fixes
            ------------------------------------------------------------
            merged: olaf at conradi.org-20060515225409-071211ddf818569a
            parent: pqm at pqm.ubuntu.com-20060512234414-3146c4df527e347f
            committer: Olaf Conradi <olaf at conradi.org>
            branch nick: bzr.0.8.olaf.fixes
            timestamp: Tue 2006-05-16 00:54:09 +0200
            message:
              Fix bug in knits when raising InvalidRevisionId without the required
              number of arguments. Fixes #44284.
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060516025158-e17dd9ec3a7c1bf3
        parent: mbp at sourcefrog.net-20060516023106-ad3248d716e61d31
        parent: olaf at conradi.org-20060513105104-b676a4444adbfe57
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr-0.8.mbp
        timestamp: Tue 2006-05-16 12:51:58 +1000
        message:
          msgeditor and bzr info improvements (olaf)
            ------------------------------------------------------------
            merged: olaf at conradi.org-20060513105104-b676a4444adbfe57
            parent: olaf at conradi.org-20060513104724-2a0bcb04bec5238c
            parent: olaf at conradi.org-20060513104144-5297f74635621793
            committer: Olaf Conradi <olaf at conradi.org>
            branch nick: bzr.0.8.olaf.integration
            timestamp: Sat 2006-05-13 12:51:04 +0200
            message:
              Merge msgeditor for bzr 0.8
                ------------------------------------------------------------
                merged: olaf at conradi.org-20060513104144-5297f74635621793
                parent: pqm at pqm.ubuntu.com-20060512234414-3146c4df527e347f
                committer: Olaf Conradi <olaf at conradi.org>
                branch nick: bzr.0.8.olaf.msgeditor
                timestamp: Sat 2006-05-13 12:41:44 +0200
                message:
                  Make msgeditor invocation comply with Debian Policy.
            ------------------------------------------------------------
            merged: olaf at conradi.org-20060513104724-2a0bcb04bec5238c
            parent: pqm at pqm.ubuntu.com-20060512234414-3146c4df527e347f
            parent: olaf at conradi.org-20060513104254-7870179e145f7f22
            committer: Olaf Conradi <olaf at conradi.org>
            branch nick: bzr.0.8.olaf.integration
            timestamp: Sat 2006-05-13 12:47:24 +0200
            message:
              Merge info backport to bzr 0.8
                ------------------------------------------------------------
                merged: olaf at conradi.org-20060513104254-7870179e145f7f22
                parent: pqm at pqm.ubuntu.com-20060512234414-3146c4df527e347f
                committer: Olaf Conradi <olaf at conradi.org>
                branch nick: bzr.0.8.olaf.info
                timestamp: Sat 2006-05-13 12:42:54 +0200
                message:
                  Backport bzr info improvements to bzr 0.8.
            ------------------------------------------------------------
            merged: pqm at pqm.ubuntu.com-20060512234414-3146c4df527e347f
            parent: pqm at pqm.ubuntu.com-20060508040124-d9a0b4d1b02abb3d
            parent: mbp at sourcefrog.net-20060512081336-eea66f8731f6e590
            committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
            branch nick: 0.8
            timestamp: Sat 2006-05-13 00:44:14 +0100
            message:
              (mbp) 0.8.1 fixes
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060516023106-ad3248d716e61d31
        parent: mbp at sourcefrog.net-20060516020808-9800049c8d9fd7ae
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr-0.8.mbp
        timestamp: Tue 2006-05-16 12:31:06 +1000
        message:
          (launchpad plugin) Improved --dry-run that uses a dummy xmlrpc service.
          
          Add a test using this that we get reasonable output.
          
          Clearer message when registration succeeds.
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060516020808-9800049c8d9fd7ae
        parent: mbp at sourcefrog.net-20060516020419-74b1882716e5b352
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr-0.8.mbp
        timestamp: Tue 2006-05-16 12:08:08 +1000
        message:
          (launchpad) default xmlrpc service url should be https
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060516020419-74b1882716e5b352
        parent: mbp at sourcefrog.net-20060516020313-cb6b4e511f21ff62
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr-0.8.mbp
        timestamp: Tue 2006-05-16 12:04:19 +1000
        message:
          Add register-branch to NEWS
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060516020313-cb6b4e511f21ff62
        parent: mbp at sourcefrog.net-20060516013043-910f9acaeba487b0
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr-0.8.mbp
        timestamp: Tue 2006-05-16 12:03:13 +1000
        message:
          (launchpad plugin) Better reporting of errors from xmlrpc
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060516013043-910f9acaeba487b0
        parent: mbp at sourcefrog.net-20060512081336-eea66f8731f6e590
        parent: mbp at sourcefrog.net-20060418071611-d30e1e28d05d05be
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr-0.8.mbp
        timestamp: Tue 2006-05-16 11:30:43 +1000
        message:
          Merge register-branch plugin into default plugins directory
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060418071611-d30e1e28d05d05be
        parent: mbp at sourcefrog.net-20060323170600-faebb9dc3cc864a6
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: register_branch
        timestamp: Tue 2006-04-18 17:16:11 +1000
        message:
          Fix wierd syntax errors in test
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060323170600-faebb9dc3cc864a6
        parent: mbp at sourcefrog.net-20060323170043-bda3caed5718072f
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: register_branch
        timestamp: Thu 2006-03-23 17:06:00 +0000
        message:
          (register-branch) override xmlrpc user-agent; move Transport construction
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060323170043-bda3caed5718072f
        parent: mbp at sourcefrog.net-20060323165407-3b0e80d1594adbfc
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: register_branch
        timestamp: Thu 2006-03-23 17:00:43 +0000
        message:
          (register-branch) set user-agent for xmlrpc
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060323165407-3b0e80d1594adbfc
        parent: mbp at sourcefrog.net-20060323165247-6ba2e570b3b76262
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: register_branch
        timestamp: Thu 2006-03-23 16:54:07 +0000
        message:
          doc
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060323165247-6ba2e570b3b76262
        parent: mbp at sourcefrog.net-20060323163916-3c500d2e41047eb7
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: register_branch
        timestamp: Thu 2006-03-23 16:52:47 +0000
        message:
          (register-branch) Add test for link_branch_to_bug and fix its parameters
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060323163916-3c500d2e41047eb7
        parent: mbp at sourcefrog.net-20060323163813-895fb25b5962965a
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: register_branch
        timestamp: Thu 2006-03-23 16:39:16 +0000
        message:
          (register-branch) additional test for registration with defaults
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060323163813-895fb25b5962965a
        parent: mbp at sourcefrog.net-20060323163221-353da0ce9b3ff424
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: register_branch
        timestamp: Thu 2006-03-23 16:38:13 +0000
        message:
          (register-branch) additional test case against mock server
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060323163221-353da0ce9b3ff424
        parent: mbp at sourcefrog.net-20060323161924-1cdc16fcb43ab55e
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: register_branch
        timestamp: Thu 2006-03-23 16:32:21 +0000
        message:
          (register-branch) fix ordering of parameters and restore transport-level test.
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060323161924-1cdc16fcb43ab55e
        parent: mbp at sourcefrog.net-20060323161802-0c40176f8582335c
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: register_branch
        timestamp: Thu 2006-03-23 16:19:24 +0000
        message:
          (register-branch) Update tests to be in-process calls to a mock server.
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060323161802-0c40176f8582335c
        parent: bjorn.tillenius at canonical.com-20060323124944-a4f88dc8fe156e71
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: register_branch
        timestamp: Thu 2006-03-23 16:18:02 +0000
        message:
          Refactor BaseRequest.submit so details of submission are in the LaunchpadService
        ------------------------------------------------------------
        merged: bjorn.tillenius at canonical.com-20060323124944-a4f88dc8fe156e71
        parent: test at canonical.com-20060323123919-81ff3b088e4195eb
        committer: Bjorn Tillenius <bjorn.tillenius at canonical.com>
        branch nick: register_branch
        timestamp: Thu 2006-03-23 12:49:44 +0000
        message:
          try to fix the tests.
        ------------------------------------------------------------
        merged: test at canonical.com-20060323123919-81ff3b088e4195eb
        parent: mbp at sourcefrog.net-20060322221021-07cc53ec4a90b3fd
        committer: test at canonical.com
        branch nick: register_branch
        timestamp: Thu 2006-03-23 12:39:19 +0000
        message:
          add possibility to link to a bug when registering a branch. factor out some common functionality from BranchRegistrationRequest.
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060322221021-07cc53ec4a90b3fd
        parent: mbp at sourcefrog.net-20060322220444-51dee38a77ce34cd
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: register_branch
        timestamp: Wed 2006-03-22 22:10:21 +0000
        message:
          doc
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060322220444-51dee38a77ce34cd
        parent: mbp at sourcefrog.net-20060322215432-77bd8f48df80b52d
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: register_branch
        timestamp: Wed 2006-03-22 22:04:44 +0000
        message:
          Allow xmlrpc service url to be overridden by $BZR_LP_XMLRPC_URL
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060322215432-77bd8f48df80b52d
        parent: mbp at sourcefrog.net-20060322200048-4a2718c8e8770351
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: register_branch
        timestamp: Wed 2006-03-22 21:54:32 +0000
        message:
          (register-branch) Add --author option and respect --dry-run
          Print the result of registration to stdout.
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060322200048-4a2718c8e8770351
        parent: mbp at sourcefrog.net-20060322192120-133f1e99d4c79477
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: register_branch
        timestamp: Wed 2006-03-22 20:00:48 +0000
        message:
          (register-branch) Add command-line options
          Refactor the way the BranchRegistrationRequest is constructed
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060322192120-133f1e99d4c79477
        parent: mbp at sourcefrog.net-20060322184034-42a088c76600c769
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: register_branch
        timestamp: Wed 2006-03-22 19:21:20 +0000
        message:
          Update xmlrpc api
          
          Prompt for user password when registering
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060322184034-42a088c76600c769
        parent: mbp at sourcefrog.net-20060322175028-5cba84fd7c2dac79
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: register_branch
        timestamp: Wed 2006-03-22 18:40:34 +0000
        message:
          Update xmlrpc api to pass product name as a parameter.
          Add new stubbed-out test.
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060322175028-5cba84fd7c2dac79
        parent: mbp at sourcefrog.net-20060316174143-bfe06d83cd3d3942
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: register_branch
        timestamp: Wed 2006-03-22 17:50:28 +0000
        message:
          doc
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060316174143-bfe06d83cd3d3942
        parent: mbp at sourcefrog.net-20060316173906-abbeb38a7df02ec6
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr_lp
        timestamp: Thu 2006-03-16 17:41:43 +0000
        message:
          Check the correct params are seen by the server
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060316173906-abbeb38a7df02ec6
        parent: mbp at sourcefrog.net-20060316173306-77f984ea48977325
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr_lp
        timestamp: Thu 2006-03-16 17:39:06 +0000
        message:
          Move test-specific values out of InstrumentedXMLRPCTransport
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060316173306-77f984ea48977325
        parent: mbp at sourcefrog.net-20060316172630-1ce8da7fecddf0f1
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr_lp
        timestamp: Thu 2006-03-16 17:33:06 +0000
        message:
          Don't transmit non-standard xmlrpc <nil> value.
          
          Factor out unneeded tests.
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060316172630-1ce8da7fecddf0f1
        parent: mbp at sourcefrog.net-20060316170213-9259b421a5f928ae
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr_lp
        timestamp: Thu 2006-03-16 17:26:30 +0000
        message:
          More instrumentation of xmlrpc requests
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060316170213-9259b421a5f928ae
        parent: mbp at sourcefrog.net-20060315201600-e5ab14d14424bbb3
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr_lp
        timestamp: Thu 2006-03-16 17:02:13 +0000
        message:
          Start making provision to test using a mock xmlrpc transport.
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060315201600-e5ab14d14424bbb3
        parent: mbp at sourcefrog.net-20060315195615-1cc5a36be3e3727b
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr_lp
        timestamp: Wed 2006-03-15 20:16:00 +0000
        message:
          Put the rest of the parameters into the registration request.
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060315195615-1cc5a36be3e3727b
        parent: mbp at sourcefrog.net-20060315194605-8b8ce129bff44a1d
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr_lp
        timestamp: Wed 2006-03-15 19:56:15 +0000
        message:
          Add structured test for parameters passed through xmlrpc
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060315194605-8b8ce129bff44a1d
        parent: mbp at sourcefrog.net-20060315184026-31e5677a5fa766c7
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr_lp
        timestamp: Wed 2006-03-15 19:46:05 +0000
        message:
          Start forming xmlrpc requests
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060315184026-31e5677a5fa766c7
        parent: mbp at sourcefrog.net-20060315183000-76436e1498c38f7a
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr_lp
        timestamp: Wed 2006-03-15 18:40:26 +0000
        message:
          More command line processing
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060315183000-76436e1498c38f7a
        parent: mbp at sourcefrog.net-20060315182723-34caff0963d7c484
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr_lp
        timestamp: Wed 2006-03-15 18:30:00 +0000
        message:
          Rename command to 'register-branch'
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060315182723-34caff0963d7c484
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr_lp
        timestamp: Wed 2006-03-15 18:27:23 +0000
        message:
          Start lp-register command
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060517041635-bddf9ea599d8240e
    parent: mbp at sourcefrog.net-20060512083216-221231851ad9585e
    parent: pqm at pqm.ubuntu.com-20060516144152-05cdf3bd9a34b467
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.integration
    timestamp: Wed 2006-05-17 14:16:35 +1000
    message:
      (merge) bzr.dev
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060512083216-221231851ad9585e
    parent: mbp at sourcefrog.net-20060512082923-38e14b057e08246e
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.integration
    timestamp: Fri 2006-05-12 18:32:16 +1000
    message:
      Remove TODO about knit testing printed from test suite
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060512082923-38e14b057e08246e
    parent: mbp at sourcefrog.net-20060512065947-60e259ffea0bf4fb
    parent: mbp at sourcefrog.net-20060512081336-eea66f8731f6e590
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.integration
    timestamp: Fri 2006-05-12 18:29:23 +1000
    message:
      [merge] work from 0.8 fixes
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060512081336-eea66f8731f6e590
    parent: mbp at sourcefrog.net-20060512074813-1452d14de10a7868
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr-0.8.mbp
    timestamp: Fri 2006-05-12 18:13:36 +1000
    message:
      Prepare 0.8.1 release
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060512074813-1452d14de10a7868
    parent: mbp at sourcefrog.net-20060512073645-1e43a8ead0ec61cb
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr-0.8.mbp
    timestamp: Fri 2006-05-12 17:48:13 +1000
    message:
      Workaround for problem exercising commit in test
      
      0.8 doesn't support 'bzr commit DIR' when the dir contains a merge
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060512073645-1e43a8ead0ec61cb
    parent: mbp at sourcefrog.net-20060511074014-7d070b11bd39baf7
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr-0.8.mbp
    timestamp: Fri 2006-05-12 17:36:45 +1000
    message:
      [broken] fix up display of files changed by a commit
      
      Needs an additional cherrypick to work well because the tests depend on 
      new behaviour of 'bzr commit DIR'
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060511074014-7d070b11bd39baf7
    parent: mbp at sourcefrog.net-20060511072822-b26d83f646b1c935
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr-0.8.mbp
    timestamp: Thu 2006-05-11 17:40:14 +1000
    message:
      Bump version to 0.8.1, update NEWS
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060511072822-b26d83f646b1c935
    parent: pqm at pqm.ubuntu.com-20060508040124-d9a0b4d1b02abb3d
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr-0.8.mbp
    timestamp: Thu 2006-05-11 17:28:22 +1000
    message:
      [patch] use the correct transaction when committing snapshot (Malone: #43959)
      
      Without this, file merges committed in a checkout can't be properly 
      pushed into the master repository.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060508040124-d9a0b4d1b02abb3d
    parent: pqm at pqm.ubuntu.com-20060508035123-aa6bac1e9ba18f94
    parent: pqm at pqm.ubuntu.com-20060508035625-57977d108d877af8
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: 0.8
    timestamp: Mon 2006-05-08 05:01:24 +0100
    message:
      (mbp) update version number
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060508035123-aa6bac1e9ba18f94
    parent: pqm at pqm.ubuntu.com-20060418052303-2170dd38c5ed278b
    parent: pqm at pqm.ubuntu.com-20060508022019-ad3b41d875be4d4d
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: 0.8
    timestamp: Mon 2006-05-08 04:51:23 +0100
    message:
      (mbp) merge bzr.dev to 0.8, prepare for release



More information about the bazaar-commits mailing list