Rev 582: Merge upstream. in file:///data/jelmer/bzr-svn/revprops/

Jelmer Vernooij jelmer at samba.org
Tue Oct 2 00:30:57 BST 2007


At file:///data/jelmer/bzr-svn/revprops/

------------------------------------------------------------
revno: 582
revision-id: jelmer at samba.org-20071001233054-whbjbtcblvum9qrf
parent: jelmer at samba.org-20070913215650-ernvveuax2akbinx
parent: jelmer at samba.org-20071001181833-0ziqv0xb584jl20k
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: revprops
timestamp: Tue 2007-10-02 01:30:54 +0200
message:
  Merge upstream.
added:
  format.py                      format.py-20070917005147-94kb7zysotf82kqw-1
renamed:
  format.py => remote.py format.py-20060406233823-b6fa009fe35dfde7
modified:
  FAQ                            faq-20070910195147-p9u38s9wplds2d4o-1
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
  branch.py                      svnbranch.py-20051017135706-11c749eb0dab04a7
  branchprops.py                 branchprops.py-20061223204623-80lvm7pjrpsgk0dd-1
  commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
  errors.py                      errors.py-20061226172623-w1sbj8ynpo0eojqp-1
  fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
  fileids.py                     fileids.py-20060714013623-u5iiyqqnko11grcf-1
  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_blackbox.py         test_blackbox.py-20070325150839-d10llf8arptpcfl6-1
  tests/test_branch.py           test_branch.py-20060508162215-74ffeb5d608f8e20
  tests/test_checkout.py         test_checkout.py-20070101154110-eevkc29qj0q7udz5-1
  tests/test_commit.py           test_commit.py-20060624213521-l5kcufywkh9mnilk-1
  tests/test_errors.py           test_errors.py-20070129114605-ban03f32t6ja14ez-1
  tests/test_fetch.py            test_fetch.py-20070624210302-luvgwjmlfysk5qeq-1
  tests/test_fileids.py          test_fileids.py-20060622131341-19gyrlgqy8yl2od5-1
  tests/test_logwalker.py        test_logwalker.py-20060622141944-pkocc3rj8g62ukbi-1
  tests/test_push.py             test_push.py-20070201165715-g2ievcdfqi33wqsy-1
  tests/test_radir.py            test_radir.py-20061231173434-31utf9o4byu7wktm-1
  tests/test_scheme.py           test_scheme.py-20060621221855-va2xabhlxpmc9llx-1
  tests/test_workingtree.py      test_workingtree.py-20060622191524-0di7bc3q1ckdbybb-1
  workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
  remote.py                      format.py-20060406233823-b6fa009fe35dfde7
    ------------------------------------------------------------
    revno: 579.1.141
    revision-id: jelmer at samba.org-20071001181833-0ziqv0xb584jl20k
    parent: jelmer at samba.org-20070926021308-mji79tvaal40fdz2
    parent: jelmer at samba.org-20070926120521-pf02sdwj0shlev95
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2007-10-01 20:18:33 +0200
    message:
      Merge some offline changes.
    modified:
      NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
      __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
      tests/test_blackbox.py         test_blackbox.py-20070325150839-d10llf8arptpcfl6-1
      tests/test_workingtree.py      test_workingtree.py-20060622191524-0di7bc3q1ckdbybb-1
        ------------------------------------------------------------
        revno: 579.1.140.1.3
        revision-id: jelmer at samba.org-20070926120521-pf02sdwj0shlev95
        parent: jelmer at samba.org-20070926115802-qdslky3kk1v2k8r5
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: 0.4
        timestamp: Wed 2007-09-26 14:05:21 +0200
        message:
          Give proper warning message when running 'bzr svn-import' on something that is 
          not a Subversion repository. 
        modified:
          NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
          __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
        ------------------------------------------------------------
        revno: 579.1.140.1.2
        revision-id: jelmer at samba.org-20070926115802-qdslky3kk1v2k8r5
        parent: jelmer at samba.org-20070926114550-i2ik0775h63xepgy
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: 0.4
        timestamp: Wed 2007-09-26 13:58:02 +0200
        message:
          Use new KnownFailure exception.
        modified:
          tests/test_workingtree.py      test_workingtree.py-20060622191524-0di7bc3q1ckdbybb-1
        ------------------------------------------------------------
        revno: 579.1.140.1.1
        revision-id: jelmer at samba.org-20070926114550-i2ik0775h63xepgy
        parent: jelmer at samba.org-20070926021308-mji79tvaal40fdz2
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: 0.4
        timestamp: Wed 2007-09-26 13:45:50 +0200
        message:
          Give proper warning message when running 'bzr svn-branching-scheme' on something that is not a Subversion repository. (#145159)
        modified:
          NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
          __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
          tests/test_blackbox.py         test_blackbox.py-20070325150839-d10llf8arptpcfl6-1
    ------------------------------------------------------------
    revno: 579.1.140
    revision-id: jelmer at samba.org-20070926021308-mji79tvaal40fdz2
    parent: jelmer at samba.org-20070925134348-1bsc948sqqmevhvh
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Wed 2007-09-26 04:13:08 +0200
    message:
      Add entry about svn-upgrade.
    modified:
      FAQ                            faq-20070910195147-p9u38s9wplds2d4o-1
    ------------------------------------------------------------
    revno: 579.1.139
    revision-id: jelmer at samba.org-20070925134348-1bsc948sqqmevhvh
    parent: jelmer at samba.org-20070924192319-2mngfkpkb63u4il8
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2007-09-25 15:43:48 +0200
    message:
      Add note on svn versions.
    modified:
      FAQ                            faq-20070910195147-p9u38s9wplds2d4o-1
    ------------------------------------------------------------
    revno: 579.1.138
    revision-id: jelmer at samba.org-20070924192319-2mngfkpkb63u4il8
    parent: jelmer at samba.org-20070924190759-93ewsf9v76il6u1b
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2007-09-24 21:23:19 +0200
    message:
      Mention bug#
    modified:
      NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
    ------------------------------------------------------------
    revno: 579.1.137
    revision-id: jelmer at samba.org-20070924190759-93ewsf9v76il6u1b
    parent: jelmer at samba.org-20070924133525-6rkz6tth4oo8cfht
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2007-09-24 21:07:59 +0200
    message:
      Implement ListBranchingScheme.is_branch_parent().
    modified:
      FAQ                            faq-20070910195147-p9u38s9wplds2d4o-1
      NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
      scheme.py                      scheme.py-20060516195850-95181aae6b272f9e
      tests/test_scheme.py           test_scheme.py-20060621221855-va2xabhlxpmc9llx-1
    ------------------------------------------------------------
    revno: 579.1.136
    revision-id: jelmer at samba.org-20070924133525-6rkz6tth4oo8cfht
    parent: jelmer at samba.org-20070923234830-4je4o9hw0mxhnzrt
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2007-09-24 15:35:25 +0200
    message:
      Add news entry for FAQ.
    modified:
      NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
    ------------------------------------------------------------
    revno: 579.1.135
    revision-id: jelmer at samba.org-20070923234830-4je4o9hw0mxhnzrt
    parent: jelmer at samba.org-20070923233618-4s01m5kmnr7a2j89
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2007-09-24 01:48:30 +0200
    message:
      Handle long file names with unicode characters correctly on python2.4 (#129334)
    modified:
      NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
      fileids.py                     fileids.py-20060714013623-u5iiyqqnko11grcf-1
      tests/test_fileids.py          test_fileids.py-20060622131341-19gyrlgqy8yl2od5-1
    ------------------------------------------------------------
    revno: 579.1.134
    revision-id: jelmer at samba.org-20070923233618-4s01m5kmnr7a2j89
    parent: jelmer at samba.org-20070923232745-dnzeidfrpch11l3g
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2007-09-24 01:36:18 +0200
    message:
      Work around timestamp bug in svn.
    modified:
      tests/test_branch.py           test_branch.py-20060508162215-74ffeb5d608f8e20
    ------------------------------------------------------------
    revno: 579.1.133
    revision-id: jelmer at samba.org-20070923232745-dnzeidfrpch11l3g
    parent: jelmer at samba.org-20070920192859-5tej7js5bal4d2b2
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2007-09-24 01:27:45 +0200
    message:
      Support NULL_REVISION being passed to copy_contnet().
    modified:
      NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
      fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
      tests/test_fetch.py            test_fetch.py-20070624210302-luvgwjmlfysk5qeq-1
    ------------------------------------------------------------
    revno: 579.1.132
    revision-id: jelmer at samba.org-20070920192859-5tej7js5bal4d2b2
    parent: jelmer at samba.org-20070919205846-fxrh6i15hot2rggh
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Thu 2007-09-20 21:28:59 +0200
    message:
      Fetch revisions in chunks of a 1000.
    modified:
      logwalker.py                   logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
    ------------------------------------------------------------
    revno: 579.1.131
    revision-id: jelmer at samba.org-20070919205846-fxrh6i15hot2rggh
    parent: jelmer at samba.org-20070919202923-tacnm3q7g4retb3l
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Wed 2007-09-19 22:58:46 +0200
    message:
      Add note about revno's.
    modified:
      FAQ                            faq-20070910195147-p9u38s9wplds2d4o-1
    ------------------------------------------------------------
    revno: 579.1.130
    revision-id: jelmer at samba.org-20070919202923-tacnm3q7g4retb3l
    parent: jelmer at samba.org-20070919130421-uzg17uzqsbangevu
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Wed 2007-09-19 22:29:23 +0200
    message:
      fix import
    modified:
      format.py                      format.py-20070917005147-94kb7zysotf82kqw-1
    ------------------------------------------------------------
    revno: 579.1.129
    revision-id: jelmer at samba.org-20070919130421-uzg17uzqsbangevu
    parent: jelmer at samba.org-20070919125040-px0fmwqjlpg6xzu6
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Wed 2007-09-19 15:04:21 +0200
    message:
      Fix rst formatting, add entry about slow fetch.
    modified:
      FAQ                            faq-20070910195147-p9u38s9wplds2d4o-1
    ------------------------------------------------------------
    revno: 579.1.128
    revision-id: jelmer at samba.org-20070919125040-px0fmwqjlpg6xzu6
    parent: jelmer at samba.org-20070917141905-4d63vfu32clr7byw
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Wed 2007-09-19 14:50:40 +0200
    message:
      Avoid tracebacks on malformed data errors.
    modified:
      NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
      errors.py                      errors.py-20061226172623-w1sbj8ynpo0eojqp-1
      tests/test_errors.py           test_errors.py-20070129114605-ban03f32t6ja14ez-1
    ------------------------------------------------------------
    revno: 579.1.127
    revision-id: jelmer at samba.org-20070917141905-4d63vfu32clr7byw
    parent: jelmer at samba.org-20070917131846-5pkptswuslxq6vxp
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2007-09-17 16:19:05 +0200
    message:
      Update news, remove some more imports.
    modified:
      NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
      __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
      format.py                      format.py-20070917005147-94kb7zysotf82kqw-1
    ------------------------------------------------------------
    revno: 579.1.126
    revision-id: jelmer at samba.org-20070917131846-5pkptswuslxq6vxp
    parent: jelmer at samba.org-20070917004818-54js9xqdq60afq2k
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2007-09-17 15:18:46 +0200
    message:
      Move format code into separate file to improve import time when bzr-svn isn't used.
    added:
      format.py                      format.py-20070917005147-94kb7zysotf82kqw-1
    renamed:
      format.py => remote.py format.py-20060406233823-b6fa009fe35dfde7
    modified:
      __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
      branch.py                      svnbranch.py-20051017135706-11c749eb0dab04a7
      repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
      tests/__init__.py              __init__.py-20060508151940-e9f4d914801a2535
      tests/test_checkout.py         test_checkout.py-20070101154110-eevkc29qj0q7udz5-1
      tests/test_fetch.py            test_fetch.py-20070624210302-luvgwjmlfysk5qeq-1
      tests/test_radir.py            test_radir.py-20061231173434-31utf9o4byu7wktm-1
      workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
      remote.py                      format.py-20060406233823-b6fa009fe35dfde7
    ------------------------------------------------------------
    revno: 579.1.125
    revision-id: jelmer at samba.org-20070917004818-54js9xqdq60afq2k
    parent: jelmer at samba.org-20070917004647-de6wj1lcfohgmx30
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2007-09-17 02:48:18 +0200
    message:
      Register optimizers lazily.
    modified:
      __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
      repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
    ------------------------------------------------------------
    revno: 579.1.124
    revision-id: jelmer at samba.org-20070917004647-de6wj1lcfohgmx30
    parent: jelmer at samba.org-20070915234705-72k286etjgjr1bgt
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2007-09-17 02:46:47 +0200
    message:
      Start working on 0.4.4.
    modified:
      __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
      setup.py                       setup.py-20060502115218-86950492da22353f
    ------------------------------------------------------------
    revno: 579.1.123
    revision-id: jelmer at samba.org-20070915234705-72k286etjgjr1bgt
    parent: jelmer at samba.org-20070915033114-0lbb6vyhr51ccwdh
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sun 2007-09-16 01:47:05 +0200
    message:
      Release 0.4.3.
    modified:
      NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
      __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
    ------------------------------------------------------------
    revno: 579.1.122
    revision-id: jelmer at samba.org-20070915033114-0lbb6vyhr51ccwdh
    parent: jelmer at samba.org-20070914212428-3fzjhkpmk1hit4x8
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sat 2007-09-15 05:31:14 +0200
    message:
      Handle pushing merges of which LHS parent is older revision of branch path.
    modified:
      NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
      branchprops.py                 branchprops.py-20061223204623-80lvm7pjrpsgk0dd-1
      commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
      logwalker.py                   logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
      repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
      tests/test_checkout.py         test_checkout.py-20070101154110-eevkc29qj0q7udz5-1
      tests/test_logwalker.py        test_logwalker.py-20060622141944-pkocc3rj8g62ukbi-1
      tests/test_push.py             test_push.py-20070201165715-g2ievcdfqi33wqsy-1
    ------------------------------------------------------------
    revno: 579.1.121
    revision-id: jelmer at samba.org-20070914212428-3fzjhkpmk1hit4x8
    parent: jelmer at samba.org-20070914201446-j82vodke06afl8yq
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2007-09-14 23:24:28 +0200
    message:
      Fix tests.
    modified:
      tests/test_commit.py           test_commit.py-20060624213521-l5kcufywkh9mnilk-1
      workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
    ------------------------------------------------------------
    revno: 579.1.120
    revision-id: jelmer at samba.org-20070914201446-j82vodke06afl8yq
    parent: jelmer at samba.org-20070914192016-d3c6x742sm5q4gs3
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2007-09-14 22:14:46 +0200
    message:
      Simplify branch access of workingtree.
    modified:
      format.py                      format.py-20060406233823-b6fa009fe35dfde7
      workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
    ------------------------------------------------------------
    revno: 579.1.119
    revision-id: jelmer at samba.org-20070914192016-d3c6x742sm5q4gs3
    parent: jelmer at samba.org-20070914190316-may1lb1um7us3b5b
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2007-09-14 21:20:16 +0200
    message:
      Register subversion-wc as format, but keep it non-initialiable.
    modified:
      NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
      __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
      workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
    ------------------------------------------------------------
    revno: 579.1.118
    revision-id: jelmer at samba.org-20070914190316-may1lb1um7us3b5b
    parent: jelmer at samba.org-20070913212123-r94ap0ggbrnfaiuf
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2007-09-14 21:03:16 +0200
    message:
      Implemented SvnWorkingTreeDir.needs_format_conversion().
    modified:
      tests/test_checkout.py         test_checkout.py-20070101154110-eevkc29qj0q7udz5-1
      workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de

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



More information about the bazaar-commits mailing list