Rev 1607: Various fixes for win32 in /home/pqm/archives/thelove/bzr/+trunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Fri Mar 31 01:43:23 BST 2006


------------------------------------------------------------
revno: 1607
revision-id: pqm at pqm.ubuntu.com-20060331004321-2171d32febcbfe4d
parent: pqm at pqm.ubuntu.com-20060330053557-a81c03289ce7560d
parent: abentley at lappy-20060330051123-891ff5afa0395578
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-03-31 01:43:21 +0100
message:
  Various fixes for win32
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
  bzrlib/doc/api/transport.txt   transport.txt-20051224020744-66b4fb564d98a5a5
  bzrlib/tests/blackbox/test_aliases.py test_aliases.py-20060210230318-f0c08c9294dbfae1
  bzrlib/tests/blackbox/test_bound_branches.py test_bound_branches.py-20051109215527-2373188ad566c205
  bzrlib/tests/blackbox/test_logformats.py test_logformats.py-20060216104208-ba5a16c83480b7e4
  bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
  bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
  bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
  bzrlib/tests/test_hashcache.py testhashcache.py-20050706091800-0288ab2659338981
  bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
  bzrlib/transport/local.py      local_transport.py-20050711165921-9b1f142bfe480c24
    ------------------------------------------------------------
    merged: abentley at lappy-20060330051123-891ff5afa0395578
    parent: abentley at panoramicfeedback.com-20060327171147-c62a94b1fae62e3e
    committer: abentley <abentley at lappy>
    branch nick: win32fixes
    timestamp: Thu 2006-03-30 00:11:23 -0500
    message:
      Fixed transport doctest
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060327171147-c62a94b1fae62e3e
    parent: abentley at lappy-20060312210537-990ab170fa45ed1b
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: win32fixes
    timestamp: Mon 2006-03-27 12:11:47 -0500
    message:
      Used osutils getcwd instead of replacing "\" with "/"
    ------------------------------------------------------------
    merged: abentley at lappy-20060312210537-990ab170fa45ed1b
    parent: abentley at lappy-20060312204258-ef087f3dbb76e33b
    committer: abentley <abentley at lappy>
    branch nick: Aaron's mergeable stuff
    timestamp: Sun 2006-03-12 16:05:37 -0500
    message:
      Made ConfigObj output binary-identical files on win32 and *nix
    ------------------------------------------------------------
    merged: abentley at lappy-20060312204258-ef087f3dbb76e33b
    parent: abentley at lappy-20060312202013-2320381e7249fe9f
    committer: abentley <abentley at lappy>
    branch nick: Aaron's mergeable stuff
    timestamp: Sun 2006-03-12 15:42:58 -0500
    message:
      Used ensure_config_dir exists instead of makedirs
    ------------------------------------------------------------
    merged: abentley at lappy-20060312202013-2320381e7249fe9f
    parent: abentley at lappy-20060312200719-df49c5fe6a321e00
    committer: abentley <abentley at lappy>
    branch nick: Aaron's mergeable stuff
    timestamp: Sun 2006-03-12 15:20:13 -0500
    message:
      Fixed test_selftest's use of sftp
    ------------------------------------------------------------
    merged: abentley at lappy-20060312200719-df49c5fe6a321e00
    parent: abentley at lappy-20060312195725-688c6fbb14e906c6
    committer: abentley <abentley at lappy>
    branch nick: Aaron's mergeable stuff
    timestamp: Sun 2006-03-12 15:07:19 -0500
    message:
      Made bzr missing . work on win32
    ------------------------------------------------------------
    merged: abentley at lappy-20060312195725-688c6fbb14e906c6
    parent: abentley at lappy-20060312195159-1fd3f3567036a91f
    committer: abentley <abentley at lappy>
    branch nick: Aaron's mergeable stuff
    timestamp: Sun 2006-03-12 14:57:25 -0500
    message:
      Fixed outside working tree tests
    ------------------------------------------------------------
    merged: abentley at lappy-20060312195159-1fd3f3567036a91f
    parent: abentley at lappy-20060312194247-6081996f852da0f3
    committer: abentley <abentley at lappy>
    branch nick: Aaron's mergeable stuff
    timestamp: Sun 2006-03-12 14:51:59 -0500
    message:
      Fixed config_dir thing again
    ------------------------------------------------------------
    merged: abentley at lappy-20060312194247-6081996f852da0f3
    parent: abentley at lappy-20060312193352-73526a5026fb6364
    committer: abentley <abentley at lappy>
    branch nick: Aaron's mergeable stuff
    timestamp: Sun 2006-03-12 14:42:47 -0500
    message:
      Fix bound branch tests
    ------------------------------------------------------------
    merged: abentley at lappy-20060312193352-73526a5026fb6364
    parent: abentley at lappy-20060312193257-442a425992bf1e1e
    committer: abentley <abentley at lappy>
    branch nick: Aaron's mergeable stuff
    timestamp: Sun 2006-03-12 14:33:52 -0500
    message:
      Fixed config directory creation in test_aliases
    ------------------------------------------------------------
    merged: abentley at lappy-20060312193257-442a425992bf1e1e
    parent: abentley at lappy-20060312190734-202e953bd969664f
    committer: abentley <abentley at lappy>
    branch nick: Aaron's mergeable stuff
    timestamp: Sun 2006-03-12 14:32:57 -0500
    message:
      'fixed
    ------------------------------------------------------------
    merged: abentley at lappy-20060312190734-202e953bd969664f
    parent: abentley at lappy-20060312185411-82489676adf6deb2
    committer: abentley <abentley at lappy>
    branch nick: Aaron's mergeable stuff
    timestamp: Sun 2006-03-12 14:07:34 -0500
    message:
      Fix hashcache test
    ------------------------------------------------------------
    merged: abentley at lappy-20060312185411-82489676adf6deb2
    parent: abentley at lappy-20060312184306-2581819ae1ddc21f
    committer: abentley <abentley at lappy>
    branch nick: Aaron's mergeable stuff
    timestamp: Sun 2006-03-12 13:54:11 -0500
    message:
      Fix line endings in tests
    ------------------------------------------------------------
    merged: abentley at lappy-20060312184306-2581819ae1ddc21f
    parent: aaron.bentley at utoronto.ca-20060311194950-afb18014ff7c0491
    committer: abentley <abentley at lappy>
    branch nick: Aaron's mergeable stuff
    timestamp: Sun 2006-03-12 13:43:06 -0500
    message:
      Fixed win32 bug with tell



More information about the bazaar-commits mailing list