Rev 1601: (mbp) pycurl fixes, weave commands, weave merge fixes in /home/pqm/archives/thelove/bzr/+trunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Tue Mar 28 12:35:48 BST 2006


------------------------------------------------------------
revno: 1601
revision-id: pqm at pqm.ubuntu.com-20060328113546-b4c98b0015b7f681
parent: pqm at pqm.ubuntu.com-20060327172456-dd0573475e606596
parent: mbp at sourcefrog.net-20060324191133-4f45292db5c5d487
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-03-28 12:35:46 +0100
message:
  (mbp) pycurl fixes, weave commands, weave merge fixes
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
  bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
  bzrlib/tests/test_options.py   testoptions.py-20051014093702-96457cfc86319a8f
  bzrlib/tests/test_weave.py     testknit.py-20050627023648-9833cc5562ffb785
  bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
  bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
  bzrlib/weave.py                knit.py-20050627021749-759c29984154256b
  bzrlib/weave_commands.py       weave_commands.py-20060320231507-8e9f300bffc1aa19
  setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060324191133-4f45292db5c5d487
    parent: mbp at sourcefrog.net-20060324111204-447e9b834705153f
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.integration
    timestamp: Fri 2006-03-24 19:11:33 +0000
    message:
      (weave-merge) don't treat killed-both lines as points of agreement; 
      makes sure that killed-[ab] lines next to change reasons aren't 
      omitted from conflict descriptions.
      
      Add more weave merge tests about line deletion.
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060324111204-447e9b834705153f
    parent: mbp at sourcefrog.net-20060324101822-35e1d0f4200875ac
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.integration
    timestamp: Fri 2006-03-24 11:12:04 +0000
    message:
      New 'weave-plan-merge' and 'weave-merge-text' commands lifted from weave.py
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060324101822-35e1d0f4200875ac
    parent: mbp at sourcefrog.net-20060323190053-ac6b735ff74f56d7
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.integration
    timestamp: Fri 2006-03-24 10:18:22 +0000
    message:
      typo
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060323190053-ac6b735ff74f56d7
    parent: mbp at sourcefrog.net-20060322180325-eff9250dcb85c390
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.integration
    timestamp: Thu 2006-03-23 19:00:53 +0000
    message:
      Handle 'bzr ?', etc.
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060322180325-eff9250dcb85c390
    parent: mbp at sourcefrog.net-20060322174849-c91b958b284cfde3
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.integration
    timestamp: Wed 2006-03-22 18:03:25 +0000
    message:
      Add missing selftest modules to setup.py
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060322174849-c91b958b284cfde3
    parent: mbp at sourcefrog.net-20060322125909-7d2812715ba587b6
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.integration
    timestamp: Wed 2006-03-22 17:48:49 +0000
    message:
      Fix 'bzr -h' to show help (#35940)
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060322125909-7d2812715ba587b6
    parent: mbp at sourcefrog.net-20060322124432-399b346f5d4328ff
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.integration
    timestamp: Wed 2006-03-22 12:59:09 +0000
    message:
      Improved news message for checkouts
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060322124432-399b346f5d4328ff
    parent: mbp at sourcefrog.net-20060322120537-8ec4c8b33db81378
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.integration
    timestamp: Wed 2006-03-22 12:44:32 +0000
    message:
      Add Pragma and Cache-control headers to urllib requests



More information about the bazaar-commits mailing list