Rev 1755: (jam) Fixes for urlutils.join() and get_parent() compatibility in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1755
revision-id: pqm at pqm.ubuntu.com-20060616161029-6e8fbba7b83a5c5d
parent: pqm at pqm.ubuntu.com-20060616155716-59b745c6e778fb4e
parent: john at arbash-meinel.com-20060615215428-ec45e1eb0d8ccf72
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-06-16 17:10:29 +0100
message:
  (jam) Fixes for urlutils.join() and get_parent() compatibility
modified:
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/tests/branch_implementations/test_parent.py test_parent.py-20050830052751-5e62766623c32222
  bzrlib/tests/test_urlutils.py  test_urlutils.py-20060502192900-46b1f9579987cf9c
  bzrlib/urlutils.py             urlutils.py-20060502195429-e8a161ecf8fac004
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060615215428-ec45e1eb0d8ccf72
    parent: john at arbash-meinel.com-20060615210712-534faad57d5998eb
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Thu 2006-06-15 16:54:28 -0500
    message:
      Remove redundant test.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060615210712-534faad57d5998eb
    parent: john at arbash-meinel.com-20060615205744-40167720ab00166b
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Thu 2006-06-15 16:07:12 -0500
    message:
      urlutils.join should work for root paths.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060615205744-40167720ab00166b
    parent: john at arbash-meinel.com-20060615191655-0bd4711b4a7a3e76
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Thu 2006-06-15 15:57:44 -0500
    message:
      fix a typo in bzrlib/branch
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060615191655-0bd4711b4a7a3e76
    parent: john at arbash-meinel.com-20060615191350-74d834d6bcd9a919
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Thu 2006-06-15 14:16:55 -0500
    message:
      The old parent format was utf8
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060615191350-74d834d6bcd9a919
    parent: john at arbash-meinel.com-20060615180502-0294d6ef02c0c087
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Thu 2006-06-15 14:13:50 -0500
    message:
      Allow backwards compatibility with absolute local paths in parent
      Fix up tests to use assertEqual(expected, measured)
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060615180502-0294d6ef02c0c087
    parent: john at arbash-meinel.com-20060615015802-c60e7bff5e5c71a2
    parent: pqm at pqm.ubuntu.com-20060615173615-77c08b4002e2ea97
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Thu 2006-06-15 13:05:02 -0500
    message:
      [merge] bzr.dev 1775