Rev 1946: (andrew) Correctly do stub initialization of pre-metadir trees over sftp for compatability with 0.7 and earlier. in /home/pqm/archives/thelove/bzr/+trunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Fri Aug 18 12:48:35 BST 2006


------------------------------------------------------------
revno: 1946
revision-id: pqm at pqm.ubuntu.com-20060818114834-a407f02ea4e0337b
parent: pqm at pqm.ubuntu.com-20060818104907-d9d6f22c28578d93
parent: andrew.bennetts at canonical.com-20060818105833-da59983a1a593aa9
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-08-18 12:48:34 +0100
message:
  (andrew) Correctly do stub initialization of pre-metadir trees over sftp for compatability with 0.7 and earlier.
modified:
  bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
  bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
    ------------------------------------------------------------
    merged: andrew.bennetts at canonical.com-20060818105833-da59983a1a593aa9
    parent: andrew.bennetts at canonical.com-20060818064048-174f8b9fa0ba4bf0
    parent: andrew.bennetts at canonical.com-20060818105820-733aa3b410724d83
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: old remote working tree initialisation
    timestamp: Fri 2006-08-18 20:58:33 +1000
    message:
      Merge from bzr.dev
        ------------------------------------------------------------
        merged: andrew.bennetts at canonical.com-20060818105820-733aa3b410724d83
        parent: andrew.bennetts at canonical.com-20060818072230-8c49d4cf2388bc3e
        parent: pqm at pqm.ubuntu.com-20060818104907-d9d6f22c28578d93
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: test-tweaks
        timestamp: Fri 2006-08-18 20:58:20 +1000
        message:
          Merge from bzr.dev
    ------------------------------------------------------------
    merged: andrew.bennetts at canonical.com-20060818064048-174f8b9fa0ba4bf0
    parent: andrew.bennetts at canonical.com-20060818062351-6a5e8f3e5c06b4b0
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: old remote working tree initialisation
    timestamp: Fri 2006-08-18 16:40:48 +1000
    message:
      Use createWorkingTreeOrSkip helper in test_create_workingtree.
    ------------------------------------------------------------
    merged: andrew.bennetts at canonical.com-20060818062351-6a5e8f3e5c06b4b0
    parent: andrew.bennetts at canonical.com-20060817040518-a442008b7f754db3
    parent: andrew.bennetts at canonical.com-20060818052317-d11b25d4d94dcd82
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: old remote working tree initialisation
    timestamp: Fri 2006-08-18 16:23:51 +1000
    message:
      Merge from test-tweaks.
    ------------------------------------------------------------
    merged: andrew.bennetts at canonical.com-20060817040518-a442008b7f754db3
    parent: andrew.bennetts at canonical.com-20060816075105-247520bb4ae64c4f
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: old remote working tree initialisation
    timestamp: Thu 2006-08-17 14:05:18 +1000
    message:
      Move stuff out of a try block that doesn't need to be there.
    ------------------------------------------------------------
    merged: andrew.bennetts at canonical.com-20060816075105-247520bb4ae64c4f
    parent: andrew.bennetts at canonical.com-20060816060742-f54cadc4c9e28f0a
    parent: andrew.bennetts at canonical.com-20060816074938-4316cc4941cb7f99
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: old remote working tree initialisation
    timestamp: Wed 2006-08-16 17:51:05 +1000
    message:
      Merge from test-tweaks.
    ------------------------------------------------------------
    merged: andrew.bennetts at canonical.com-20060816060742-f54cadc4c9e28f0a
    parent: andrew.bennetts at canonical.com-20060816043703-e55724620de2e8e5
    parent: andrew.bennetts at canonical.com-20060816060723-2e43f4250f4ada39
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: old remote working tree initialisation
    timestamp: Wed 2006-08-16 16:07:42 +1000
    message:
      Merge from test-tweaks.
    ------------------------------------------------------------
    merged: andrew.bennetts at canonical.com-20060816043703-e55724620de2e8e5
    parent: andrew.bennetts at canonical.com-20060811065953-086e7683e4ecb9e1
    parent: andrew.bennetts at canonical.com-20060816043642-3a72c47857450158
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: old remote working tree initialisation
    timestamp: Wed 2006-08-16 14:37:03 +1000
    message:
      Merge from bzr.dev
    ------------------------------------------------------------
    merged: andrew.bennetts at canonical.com-20060811065953-086e7683e4ecb9e1
    parent: andrew.bennetts at canonical.com-20060811060956-eb7002eaac4807d8
    parent: andrew.bennetts at canonical.com-20060811065942-f099d839ce2f8738
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: old remote working tree initialisation
    timestamp: Fri 2006-08-11 16:59:53 +1000
    message:
      Merge from test-tweaks.
    ------------------------------------------------------------
    merged: andrew.bennetts at canonical.com-20060811060956-eb7002eaac4807d8
    parent: andrew.bennetts at canonical.com-20060810135018-ea55e01db6d0df2c
    parent: andrew.bennetts at canonical.com-20060811060934-50e84de9ea6867ab
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: old remote working tree initialisation
    timestamp: Fri 2006-08-11 16:09:56 +1000
    message:
      Merge from test-tweaks.
    ------------------------------------------------------------
    merged: andrew.bennetts at canonical.com-20060810135018-ea55e01db6d0df2c
    parent: andrew.bennetts at canonical.com-20060809053322-10bf3238cc614a64
    parent: andrew.bennetts at canonical.com-20060810135005-edc3b07fabff1efc
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: old remote working tree initialisation
    timestamp: Thu 2006-08-10 23:50:18 +1000
    message:
      Merge from test-tweaks
    ------------------------------------------------------------
    merged: andrew.bennetts at canonical.com-20060809053322-10bf3238cc614a64
    parent: andrew.bennetts at canonical.com-20060809050726-44d473f93d9c8e1b
    parent: andrew.bennetts at canonical.com-20060809053314-656cdc405ebbf36e
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: old remote working tree initialisation
    timestamp: Wed 2006-08-09 15:33:22 +1000
    message:
      Merge from trivial
    ------------------------------------------------------------
    merged: andrew.bennetts at canonical.com-20060809050726-44d473f93d9c8e1b
    parent: andrew.bennetts at canonical.com-20060808045418-aa1b64d384cff417
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: old remote working tree initialisation
    timestamp: Wed 2006-08-09 15:07:26 +1000
    message:
      Make some old formats create at least a stub working tree rather than incomplete bzrdirs, and change some tests to use the test suite transport rather than hard-coded to local-only.



More information about the bazaar-commits mailing list