Rev 247: Merge 0.3.2 in http://people.samba.org/bzr/jelmer/bzr-svn/debian

Jelmer Vernooij jelmer at samba.org
Mon Mar 19 16:32:25 GMT 2007


At http://people.samba.org/bzr/jelmer/bzr-svn/debian

------------------------------------------------------------
revno: 247
revision-id: jelmer at samba.org-20070313094502-fefmx5un689m6vnu
parent: jelmer at samba.org-20070312105658-6ulcdc1sv4zm1j7l
parent: jelmer at samba.org-20070313094214-nz3rhuhp8spxhrq7
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: debian
timestamp: Tue 2007-03-13 10:45:02 +0100
message:
  Merge 0.3.2
modified:
  AUTHORS                        AUTHORS-20060508114718-4c90c0062645106d
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  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
  debian/changelog               changelog-20061009030331-beff4307o0ccq70i-3
  errors.py                      errors.py-20061226172623-w1sbj8ynpo0eojqp-1
  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
  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_scheme.py           test_scheme.py-20060621221855-va2xabhlxpmc9llx-1
  tests/test_transport.py        test_transport.py-20060621232111-xh7xvoblzsrgj79t-1
  tests/test_workingtree.py      test_workingtree.py-20060622191524-0di7bc3q1ckdbybb-1
  tree.py                        tree.py-20060624222557-dudlwqcmkf22lt2s-1
    ------------------------------------------------------------
    revno: 220.1.210
    merged: jelmer at samba.org-20070313094214-nz3rhuhp8spxhrq7
    parent: jelmer at samba.org-20070313094012-82e1acd6v06p91iv
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.3
    timestamp: Tue 2007-03-13 10:42:14 +0100
    message:
      Update TODO
    ------------------------------------------------------------
    revno: 220.1.209
    merged: jelmer at samba.org-20070313094012-82e1acd6v06p91iv
    parent: jelmer at samba.org-20070313001750-tjw1x4m48updphg6
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.3
    timestamp: Tue 2007-03-13 10:40:12 +0100
    message:
      Update year
    ------------------------------------------------------------
    revno: 220.1.208
    merged: jelmer at samba.org-20070313001750-tjw1x4m48updphg6
    parent: jelmer at samba.org-20070313001434-ynu3jjm33u1zbu9j
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.3
    timestamp: Tue 2007-03-13 01:17:50 +0100
    message:
      All of the original svn2bzr code is gone now, remove references to it.
    ------------------------------------------------------------
    revno: 220.1.207
    merged: jelmer at samba.org-20070313001434-ynu3jjm33u1zbu9j
    parent: jelmer at samba.org-20070312234911-720qkouscnlrdzhx
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.3
    timestamp: Tue 2007-03-13 01:14:34 +0100
    message:
      Disable revert test (won't fix revert before 0.3.2)
    ------------------------------------------------------------
    revno: 220.1.206
    merged: jelmer at samba.org-20070312234911-720qkouscnlrdzhx
    parent: jelmer at samba.org-20070312231130-3q3rr8sgwwf0ikzg
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.3
    timestamp: Tue 2007-03-13 00:49:11 +0100
    message:
      Add test for pushing to nested branch locations.
    ------------------------------------------------------------
    revno: 220.1.205
    merged: jelmer at samba.org-20070312231130-3q3rr8sgwwf0ikzg
    parent: jelmer at samba.org-20070312225122-7uh34ah30dqupuov
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.3
    timestamp: Tue 2007-03-13 00:11:30 +0100
    message:
      Handle unicode characters in filenames (#54736).
    ------------------------------------------------------------
    revno: 220.1.204
    merged: jelmer at samba.org-20070312225122-7uh34ah30dqupuov
    parent: jelmer at samba.org-20070312222054-r4acr5mlbresckgi
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.3
    timestamp: Mon 2007-03-12 23:51:22 +0100
    message:
      Add trivial test for PullResult().
      Initial work on a fix for #54736.
    ------------------------------------------------------------
    revno: 220.1.203
    merged: jelmer at samba.org-20070312222054-r4acr5mlbresckgi
    parent: jelmer at samba.org-20070312214831-334mlg82yvrl9395
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.3
    timestamp: Mon 2007-03-12 23:20:54 +0100
    message:
      Fix {Branch,WorkingTree}.pull() to return PullResult.
    ------------------------------------------------------------
    revno: 220.1.202
    merged: jelmer at samba.org-20070312214831-334mlg82yvrl9395
    parent: jelmer at samba.org-20070311232925-2nc3xpxxmoftgbyi
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.3
    timestamp: Mon 2007-03-12 22:48:31 +0100
    message:
      Add delta reporter argument to Branch.pull().
    ------------------------------------------------------------
    revno: 220.1.201
    merged: jelmer at samba.org-20070311232925-2nc3xpxxmoftgbyi
    parent: jelmer at samba.org-20070311231857-oadyn73j674c3u1f
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.3
    timestamp: Mon 2007-03-12 00:29:25 +0100
    message:
      Fix push instance of #85551 as well.
    ------------------------------------------------------------
    revno: 220.1.200
    merged: jelmer at samba.org-20070311231857-oadyn73j674c3u1f
    parent: jelmer at samba.org-20070311225839-b1vmok87wjge8y7x
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.3
    timestamp: Mon 2007-03-12 00:18:57 +0100
    message:
      handle unicode characters in commit messages. (#85551).
      
      Was already fixed in a jelmer at samba.org-20070311011931-ybkbi14bf2lykzv0. 
      This commit just adds a test and a news entry.
    ------------------------------------------------------------
    revno: 220.1.199
    merged: jelmer at samba.org-20070311225839-b1vmok87wjge8y7x
    parent: jelmer at samba.org-20070311015848-s4599kx059ggwd6s
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.3
    timestamp: Sun 2007-03-11 23:58:39 +0100
    message:
      Make LogWalker.find_latest_change() check parent paths too. Fixes #84087.
    ------------------------------------------------------------
    revno: 220.1.198
    merged: jelmer at samba.org-20070311015848-s4599kx059ggwd6s
    parent: jelmer at samba.org-20070311015822-bnsnpxp4i6fbk56d
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.3
    timestamp: Sun 2007-03-11 02:58:48 +0100
    message:
      Remove tests for lightweight .bzr checkouts of Subversion branches. This doesn't work with 
      dirstate (and doesn't have to, anyway)
    ------------------------------------------------------------
    revno: 220.1.197
    merged: jelmer at samba.org-20070311015822-bnsnpxp4i6fbk56d
    parent: jelmer at samba.org-20070311011931-ybkbi14bf2lykzv0
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.3
    timestamp: Sun 2007-03-11 02:58:22 +0100
    message:
      Allow WorkingTree.add() arguments to be strings.
    ------------------------------------------------------------
    revno: 220.1.196
    merged: jelmer at samba.org-20070311011931-ybkbi14bf2lykzv0
    parent: jelmer at samba.org-20070304124653-qonoqatvu19wwn8p
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.3
    timestamp: Sun 2007-03-11 02:19:31 +0100
    message:
      Fix the unicode revid/fileid warnings.
    ------------------------------------------------------------
    revno: 220.1.195
    merged: jelmer at samba.org-20070304124653-qonoqatvu19wwn8p
    parent: jelmer at samba.org-20070210134644-yh0z59tdetv4qfcj
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.3
    timestamp: Sun 2007-03-04 13:46:53 +0100
    message:
      Prepare for 0.3.2
    ------------------------------------------------------------
    revno: 220.1.194
    merged: jelmer at samba.org-20070210134644-yh0z59tdetv4qfcj
    parent: jelmer at samba.org-20070131130828-jk3tbipjwu68cyad
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.3
    timestamp: Sat 2007-02-10 14:46:44 +0100
    message:
      Add some more assertions.
    ------------------------------------------------------------
    revno: 220.1.193
    merged: jelmer at samba.org-20070131130828-jk3tbipjwu68cyad
    parent: jelmer at samba.org-20070131130501-axscb3hqivrlem80
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.3
    timestamp: Wed 2007-01-31 14:08:28 +0100
    message:
      Change compatibility back to 0.14
    ------------------------------------------------------------
    revno: 220.1.192
    merged: jelmer at samba.org-20070131130501-axscb3hqivrlem80
    parent: jelmer at samba.org-20070124142002-rbqv3bbu1kzf6xpu
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.3
    timestamp: Wed 2007-01-31 14:05:01 +0100
    message:
      Prepare for 0.3.1
    ------------------------------------------------------------
    revno: 220.1.191
    merged: jelmer at samba.org-20070124142002-rbqv3bbu1kzf6xpu
    parent: jelmer at samba.org-20070124125822-cnzucxd5i9nhmgvy
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.3
    timestamp: Wed 2007-01-24 15:20:02 +0100
    message:
      Warn about versions of sqlite that are too old.
    ------------------------------------------------------------
    revno: 220.1.190
    merged: jelmer at samba.org-20070124125822-cnzucxd5i9nhmgvy
    parent: jelmer at samba.org-20070120193547-uaovrc0qedo1q76x
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.3
    timestamp: Wed 2007-01-24 13:58:22 +0100
    message:
      Fix warning, thanks metze
    ------------------------------------------------------------
    revno: 220.1.189
    merged: jelmer at samba.org-20070120193547-uaovrc0qedo1q76x
    parent: jelmer at samba.org-20070120160640-9ugp4ouw4cjohbew
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.3
    timestamp: Sat 2007-01-20 20:35:47 +0100
    message:
      Remove unused code, fix import
    ------------------------------------------------------------
    revno: 220.1.188
    merged: jelmer at samba.org-20070120160640-9ugp4ouw4cjohbew
    parent: jelmer at samba.org-20070120131357-68vd9qrqm8kip49m
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.3
    timestamp: Sat 2007-01-20 17:06:40 +0100
    message:
      Update NEWS
    ------------------------------------------------------------
    revno: 220.1.187
    merged: jelmer at samba.org-20070120131357-68vd9qrqm8kip49m
    parent: jelmer at samba.org-20070119181806-zaqx8bkxnhycrxri
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.3
    timestamp: Sat 2007-01-20 14:13:57 +0100
    message:
      Warn about outdated subversion versions.
    ------------------------------------------------------------
    revno: 220.1.186
    merged: jelmer at samba.org-20070119181806-zaqx8bkxnhycrxri
    parent: jelmer at samba.org-20070118193947-xql1atdnvjhvbvrt
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.3
    timestamp: Fri 2007-01-19 19:18:06 +0100
    message:
      Add check for pysqlite version
    ------------------------------------------------------------
    revno: 220.1.185
    merged: jelmer at samba.org-20070118193947-xql1atdnvjhvbvrt
    parent: jelmer at samba.org-20070116035605-h2kb6hlr8ycht9ag
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.3
    timestamp: Thu 2007-01-18 20:39:47 +0100
    message:
      Merge BzrError fix from Wouter.

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



More information about the bazaar-commits mailing list