Robert Collins robertc at robertcollins.net
Mon Oct 24 03:53:10 CDT 2005


------------------------------------------------------------
revno: 1387
revision-id: robertc at robertcollins.net-20051024085306-a3173edd40c87abd
parent: robertc at robertcollins.net-20051024083732-7f99eeec70f2bbb8
parent: mbp at sourcefrog.net-20051024023528-817a47f36cb21963
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-10-24 18:53:06 +1000
message:
  merge from martin
added:
  bzrlib/win32console.py         win32console.py-20051021033308-123c6c929d04973d
renamed:
  bzrlib/selftest/plugins.py => bzrlib/selftest/testplugins.py plugins.py-20050622075746-32002b55e5e943e9
modified:
  HACKING                        HACKING-20050805200004-2a5dc975d870f78c
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
  bzrlib/selftest/HTTPTestUtil.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
  bzrlib/selftest/teststatus.py  teststatus.py-20050712014354-508855eb9f29f7dc
  bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
  bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051024023528-817a47f36cb21963
    parent: mbp at sourcefrog.net-20051024022002-91c6683873cdbb87
    parent: robertc at robertcollins.net-20051023151126-c18d3642d09a27ba
    committer: mbp at sourcefrog.net
    timestamp: Mon 2005-10-24 12:35:28 +1000
    message:
      [merge] robertc
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051024022002-91c6683873cdbb87
    parent: mbp at sourcefrog.net-20051021053602-d0b789804a0dbdd7
    committer: mbp at sourcefrog.net
    timestamp: Mon 2005-10-24 12:20:02 +1000
    message:
      Fix http server tests for win32/macos (John)
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051021053602-d0b789804a0dbdd7
    parent: mbp at sourcefrog.net-20051021051225-4d9cebc5dde11096
    committer: mbp at sourcefrog.net
    timestamp: Fri 2005-10-21 15:36:02 +1000
    message:
      Make commit message long enough in test for pending merges
      so that we see the elipsis characters.
      
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051021051225-4d9cebc5dde11096
    parent: mbp at sourcefrog.net-20051021033318-5a5e313f24684453
    committer: mbp at sourcefrog.net
    timestamp: Fri 2005-10-21 15:12:25 +1000
    message:
      - fix line endings in sftp transport
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051021033318-5a5e313f24684453
    parent: mbp at sourcefrog.net-20051020053220-98d5bce475edc359
    committer: mbp at sourcefrog.net
    timestamp: Fri 2005-10-21 13:33:18 +1000
    message:
      - win32 get_console_size from Alexander
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051020053220-98d5bce475edc359
    parent: mbp at sourcefrog.net-20051020040116-3896b2868de9e05e
    committer: mbp at sourcefrog.net
    timestamp: Thu 2005-10-20 15:32:20 +1000
    message:
      - rules for using destructors
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051020040116-3896b2868de9e05e
    parent: mbp at sourcefrog.net-20051020035533-aeb2314d74708a3d
    committer: mbp at sourcefrog.net
    timestamp: Thu 2005-10-20 14:01:16 +1000
    message:
      - fix indents
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051020035533-aeb2314d74708a3d
    parent: mbp at sourcefrog.net-20051020034046-c15388d921246708
    committer: mbp at sourcefrog.net
    timestamp: Thu 2005-10-20 13:55:33 +1000
    message:
      - notes on testability of plugins
      
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051020034046-c15388d921246708
    parent: mbp at sourcefrog.net-20051020021707-8a59b483bb86fe9c
    committer: mbp at sourcefrog.net
    timestamp: Thu 2005-10-20 13:40:46 +1000
    message:
      - give a quieter warning if a plugin can't be loaded
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051020021707-8a59b483bb86fe9c
    parent: mbp at sourcefrog.net-20051019070401-0536bd80d1282c7f
    parent: robertc at robertcollins.net-20051020010507-5b7356be0f80930e
    committer: mbp at sourcefrog.net
    timestamp: Thu 2005-10-20 12:17:07 +1000
    message:
      [merge] robert



More information about the bazaar-commits mailing list