Rev 440: Merge fixes from upstream in sftp://people.samba.org/~/bzr/bzr-svn/nestedtrees/

[Jelmer Vernooij]

At sftp://people.samba.org/~/bzr/bzr-svn/nestedtrees/

------------------------------------------------------------
revno: 440
revision-id: jelmer at samba.org-20070325191108-fwehry52kgherrvc
parent: jelmer at samba.org-20070319150611-xqvlyc1japnb1f4z
parent: jelmer at samba.org-20070325184140-tjuwjts3rly7uypl
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: nestedtrees
timestamp: Sun 2007-03-25 21:11:08 +0200
message:
  Merge fixes from upstream
added:
  tests/test_blackbox.py         test_blackbox.py-20070325150839-d10llf8arptpcfl6-1
modified:
  TODO                           todo-20060729211917-2kpobww0zyvvo0j2-1
  __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
  branch.py                      svnbranch.py-20051017135706-11c749eb0dab04a7
  branchprops.py                 branchprops.py-20061223204623-80lvm7pjrpsgk0dd-1
  checkout.py                    workingtree.py-20060306120941-b083cb0fdd4a69de
  commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
  convert.py                     svn2bzr.py-20051018015439-cb4563bff29e632d
  fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
  fileids.py                     fileids.py-20060714013623-u5iiyqqnko11grcf-1
  format.py                      format.py-20060406233823-b6fa009fe35dfde7
  logwalker.py                   logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
  repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
  scheme.py                      scheme.py-20060516195850-95181aae6b272f9e
  setup.py                       setup.py-20060502115218-86950492da22353f
  tests/__init__.py              __init__.py-20060508151940-e9f4d914801a2535
  tests/test_branch.py           test_branch.py-20060508162215-74ffeb5d608f8e20
  tests/test_branchprops.py      test_branchprops.py-20061223210444-04xf5224zcg69m3w-1
  tests/test_checkout.py         test_checkout.py-20070101154110-eevkc29qj0q7udz5-1
  tests/test_commit.py           test_commit.py-20060624213521-l5kcufywkh9mnilk-1
  tests/test_convert.py          test_convert.py-20060705203611-b1l0bapeku6foco0-1
  tests/test_fileids.py          test_fileids.py-20060622131341-19gyrlgqy8yl2od5-1
  tests/test_logwalker.py        test_logwalker.py-20060622141944-pkocc3rj8g62ukbi-1
  tests/test_radir.py            test_radir.py-20061231173434-31utf9o4byu7wktm-1
  tests/test_repos.py            test_repos.py-20060508151940-ddc49a59257ca712
  tests/test_transport.py        test_transport.py-20060621232111-xh7xvoblzsrgj79t-1
  tests/test_tree.py             test_tree.py-20070103204350-pr8nupes7e5sd2wr-1
  tests/test_upgrade.py          test_upgrade.py-20070106170128-64zt3eqggg4tng1c-1
  tests/test_workingtree.py      test_workingtree.py-20060622191524-0di7bc3q1ckdbybb-1
  transport.py                   transport.py-20060406231150-b3472d06b3a0818d
  tree.py                        tree.py-20060624222557-dudlwqcmkf22lt2s-1
  upgrade.py                     upgrade.py-20070106192108-0rakplee2lzah4gs-1
    ------------------------------------------------------------
    revno: 438.1.4
    merged: jelmer at samba.org-20070325184140-tjuwjts3rly7uypl
    parent: jelmer at samba.org-20070325142008-s4xgn0ksym677933
    parent: jelmer at samba.org-20070325151508-eliztm1ms969fjk8
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Sun 2007-03-25 20:41:40 +0200
    message:
      Merge some formatting fixes, add extra tests.
        ------------------------------------------------------------
        revno: 402.1.38
        merged: jelmer at samba.org-20070325151508-eliztm1ms969fjk8
        parent: jelmer at samba.org-20070325144144-axorlmksch0g02ps
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: 0.3
        timestamp: Sun 2007-03-25 17:15:08 +0200
        message:
          Add two very trivial blackbox tests.
        ------------------------------------------------------------
        revno: 402.1.37
        merged: jelmer at samba.org-20070325144144-axorlmksch0g02ps
        parent: jelmer at samba.org-20070324154013-9slv88wjxilfigto
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: 0.3
        timestamp: Sun 2007-03-25 16:41:44 +0200
        message:
          More formatting fixes.
    ------------------------------------------------------------
    revno: 438.1.3
    merged: jelmer at samba.org-20070325142008-s4xgn0ksym677933
    parent: jelmer at samba.org-20070323135406-xk28fwaqkj8iymvs
    parent: jelmer at samba.org-20070324154013-9slv88wjxilfigto
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Sun 2007-03-25 16:20:08 +0200
    message:
      Merge formatting fixes.
        ------------------------------------------------------------
        revno: 402.1.36
        merged: jelmer at samba.org-20070324154013-9slv88wjxilfigto
        parent: jelmer at samba.org-20070321131427-3y69fpq97umynbk0
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: 0.3
        timestamp: Sat 2007-03-24 16:40:13 +0100
        message:
          General cleanups: remove unused imports, fix line lengths, unused parameters.
        ------------------------------------------------------------
        revno: 402.1.35
        merged: jelmer at samba.org-20070321131427-3y69fpq97umynbk0
        parent: jelmer at samba.org-20070319132710-iqa4xvx2die96f26
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: 0.3
        timestamp: Wed 2007-03-21 14:14:27 +0100
        message:
          Bazaar-NG -> Bazaar.
        ------------------------------------------------------------
        revno: 402.1.34
        merged: jelmer at samba.org-20070319132710-iqa4xvx2die96f26
        parent: jelmer at samba.org-20070319023001-rc2qdo3u0s2bcbvk
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: 0.3
        timestamp: Mon 2007-03-19 14:27:10 +0100
        message:
          Only warn about unknown svn: or bzr: properties, not just any random property.
    ------------------------------------------------------------
    revno: 438.1.2
    merged: jelmer at samba.org-20070323135406-xk28fwaqkj8iymvs
    parent: jelmer at samba.org-20070319150900-bcmzs21lub8zihqa
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Fri 2007-03-23 14:54:06 +0100
    message:
      Bazaar-NG -> Bazaar, update version
    ------------------------------------------------------------
    revno: 438.1.1
    merged: jelmer at samba.org-20070319150900-bcmzs21lub8zihqa
    parent: jelmer at samba.org-20070319112336-stvy6ag2g60xhxva
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Mon 2007-03-19 16:09:00 +0100
    message:
      Fix incorrect merge.

Diff too large for email (1819 lines, the limit is 1000).