Rev 1480: Merge from integration. in /home/robertc/source/baz/branch-formats/

Robert Collins robertc at robertcollins.net
Mon Jan 30 01:05:50 GMT 2006


------------------------------------------------------------
revno: 1480
revision-id: robertc at robertcollins.net-20060130010545-17e73c5d58baccda
parent: robertc at robertcollins.net-20060127080959-8cf1dbe5e2a254e5
parent: robertc at robertcollins.net-20060129221024-3fb7b838e5cd3e02
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Mon 2006-01-30 12:05:45 +1100
message:
  Merge from integration.
added:
  bzrlib/doc/                    doc-20051224020731-4d79ab81ba9b0ca7
  bzrlib/doc/__init__.py         __init__.py-20051224020731-eb3eb3ef5b4570df
  bzrlib/doc/api/                api-20051224020744-3aff371bd0c8d249
  bzrlib/doc/api/__init__.py     __init__.py-20051224020744-7b87d590843855bc
  bzrlib/doc/api/transport.txt   transport.txt-20051224020744-66b4fb564d98a5a5
modified:
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
  setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060129221024-3fb7b838e5cd3e02
    parent: robertc at robertcollins.net-20060125055408-decd09a9f3f91658
    parent: john at arbash-meinel.com-20060129155904-4f794e2243f81096
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Mon 2006-01-30 09:10:24 +1100
    message:
      Merge from jam-integration
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060129155904-4f794e2243f81096
    parent: john at arbash-meinel.com-20060127031448-ac3b2764961ab17c
    parent: robertc at robertcollins.net-20060129095252-18f4a192851eb12f
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-jam-integration
    timestamp: Sun 2006-01-29 09:59:04 -0600
    message:
      [merge] Robert's test-api
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060129095252-18f4a192851eb12f
    parent: robertc at robertcollins.net-20060112033053-a2113f24c0dc2b01
    parent: robertc at robertcollins.net-20060125055408-decd09a9f3f91658
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: test-apis
    timestamp: Sun 2006-01-29 20:52:52 +1100
    message:
      Merge from mainine.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060112033053-a2113f24c0dc2b01
    parent: robertc at robertcollins.net-20060112025928-7ae30672ae84bc0e
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: test-apis
    timestamp: Thu 2006-01-12 14:30:53 +1100
    message:
      Update for integration transport apis.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060112025928-7ae30672ae84bc0e
    parent: robertc at robertcollins.net-20051224022045-14efc8dfa0e1a4e9
    parent: robertc at robertcollins.net-20060112024225-fe991391e088dd58
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: test-apis
    timestamp: Thu 2006-01-12 13:59:28 +1100
    message:
      Merge from integration.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051224022045-14efc8dfa0e1a4e9
    parent: robertc at robertcollins.net-20051215083203-07b824bae89674c1
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: test-providers
    timestamp: Sat 2005-12-24 13:20:45 +1100
    message:
      Start tests for api usage.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060127031448-ac3b2764961ab17c
    parent: john at arbash-meinel.com-20060126151809-9fd33fa77d4a31c5
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-jam-integration
    timestamp: Thu 2006-01-26 21:14:48 -0600
    message:
      [patch] Robey Pointer: squelch the socket.error messages.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060126151809-9fd33fa77d4a31c5
    parent: john at arbash-meinel.com-20060124191602-681e9da1f16e695e
    parent: robertc at robertcollins.net-20060125055408-decd09a9f3f91658
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-jam-integration
    timestamp: Thu 2006-01-26 09:18:09 -0600
    message:
      [merge] Robert's integration 1453



More information about the bazaar-commits mailing list