Rev 328: Merge new bzr-svn 0.5. in http://bzr.debian.org/pkg-bazaar/bzr-svn/experimental

Jelmer Vernooij jelmer at samba.org
Wed Jan 14 19:12:20 GMT 2009


At http://bzr.debian.org/pkg-bazaar/bzr-svn/experimental

------------------------------------------------------------
revno: 328
revision-id: jelmer at samba.org-20090114191218-iry1t9rapyeqd00t
parent: jelmer at samba.org-20090113162848-eqi1acm2c8y7tb5z
parent: jelmer at samba.org-20090114190721-xlqju568hnxeqhfk
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: debian
timestamp: Wed 2009-01-14 20:12:18 +0100
message:
  Merge new bzr-svn 0.5.
removed:
  subvertpy/                     subvertpy-20081002184530-hz9mrr3wqq4l8qdx-1
  subvertpy/.bzrignore           bzrignore-20081002201329-yj9jf0hmrtdpfw0u-1
  subvertpy/AUTHORS              authors-20081002184818-kozkud4dvhmbez8a-1
  subvertpy/COPYING              copying-20081002184826-7ve43dwedsm8e0eh-1
  subvertpy/Makefile             makefile-20081002202532-xkdtg6p584inuoya-1
  subvertpy/TODO                 todo-20081005190627-4brj2368nxwmb0bp-1
  subvertpy/examples/            examples-20081113151832-xkzjiy3n4svpd7a2-1
  subvertpy/examples/log.py      log.py-20081113151832-xkzjiy3n4svpd7a2-2
  subvertpy/setup.py             setup.py-20060502115218-86950492da22353f
  subvertpy/subvertpy/           subvertpy-20081002201834-3k5r8h3ri3kzrzp6-1
  subvertpy/subvertpy/__init__.py core.pyx-20080313210413-17k59slolpfe5kdq-1
  subvertpy/subvertpy/_ra.c      ra.pyx-20080313140933-qybkqaxe3m4mcll7-1
  subvertpy/subvertpy/client.c   client.pyx-20080313235339-wbyjbw2namuiql8f-1
  subvertpy/subvertpy/delta.py   delta.py-20080316001917-xyng7m3jlxvdc4c9-1
  subvertpy/subvertpy/editor.c   editor.c-20080602191336-frj7az1sdk13o1tw-1
  subvertpy/subvertpy/editor.h   editor.h-20080602191336-frj7az1sdk13o1tw-2
  subvertpy/subvertpy/marshall.py marshall.py-20081006140850-jzf2dbt55rwefdqm-1
  subvertpy/subvertpy/properties.py util.py-20080502170127-o220e9py99vt69s6-1
  subvertpy/subvertpy/ra.h       ra.h-20080621214350-wlaxxs087eiu02me-1
  subvertpy/subvertpy/ra.py      ra.py-20081116162923-6yq5jahxp5y23n5t-1
  subvertpy/subvertpy/ra_svn.py  ra_svn.py-20081116165419-qplciag3b7ikc6ms-1
  subvertpy/subvertpy/repos.c    repos.pyx-20080314114432-g2b5lqe776tkbl4k-1
  subvertpy/subvertpy/server.py  server.py-20081006143330-f9p0l7eih6izgoct-1
  subvertpy/subvertpy/stdbool.h  stdbool.h-20080727235015-yn3xnbkxaaluvzd0-1
  subvertpy/subvertpy/tests/     tests-20081002184840-6jfgc90zdhmmcny2-1
  subvertpy/subvertpy/tests/__init__.py __init__.py-20081002194117-jwf9payoee8eqz7g-1
  subvertpy/subvertpy/tests/test_client.py test_client.py-20080603021344-lmgexez0yoyp9b1s-1
  subvertpy/subvertpy/tests/test_core.py test_core.py-20080603032119-q91zmret1lv84ay9-1
  subvertpy/subvertpy/tests/test_delta.py test_delta.py-20080710120654-bqapu1ccex72nwdk-1
  subvertpy/subvertpy/tests/test_marshall.py test_marshall.py-20081006140936-tuh5e2o2httgadkd-1
  subvertpy/subvertpy/tests/test_properties.py test_properties.py-20080703215223-t5ydp87wwi7dtyas-1
  subvertpy/subvertpy/tests/test_ra.py test_ra.py-20080313141743-uzsm7ejitrlqone5-1
  subvertpy/subvertpy/tests/test_repos.py test_repos.py-20080603030558-86ewiakm2z5y9x29-1
  subvertpy/subvertpy/tests/test_server.py test_server.py-20081006150547-hj71pjqjdq4a89kf-1
  subvertpy/subvertpy/tests/test_wc.py test_wc.py-20080313142315-woibd1cdv4s2lr7o-1
  subvertpy/subvertpy/util.c     util.c-20080531154025-s8ef6ej9tytsnkkw-1
  subvertpy/subvertpy/util.h     util.h-20080531154025-s8ef6ej9tytsnkkw-2
  subvertpy/subvertpy/wc.c       wc.pyx-20080313142018-10l8l23vha2j9e6b-1
  subvertpy/subvertpy/wc.h       wc.h-20080622050149-ir7xe34a497adbmp-1
modified:
  INSTALL                        install-20080708203223-nbfwz4aneslpdz5g-1
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
  debian/changelog               changelog-20061009030331-beff4307o0ccq70i-3
  debian/control                 control-20061009030331-beff4307o0ccq70i-5
  revmeta.py                     revmeta.py-20080901215045-n8a6arqybs9ez5hl-1
  setup.py                       setup.py-20081002195455-nascfq8sx5o40xap-1
  tests/test_workingtree.py      test_workingtree.py-20060622191524-0di7bc3q1ckdbybb-1
  workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
    ------------------------------------------------------------
    revno: 220.81.636
    revision-id: jelmer at samba.org-20090114190721-xlqju568hnxeqhfk
    parent: jelmer at samba.org-20090114185515-tk0yliyszgie9c2j
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.5
    timestamp: Wed 2009-01-14 20:07:21 +0100
    message:
      Remove another 2.5-ism.
    modified:
      workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
    ------------------------------------------------------------
    revno: 220.81.635
    revision-id: jelmer at samba.org-20090114185515-tk0yliyszgie9c2j
    parent: jelmer at samba.org-20090114183223-ajmt87iurn1ln40l
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.5
    timestamp: Wed 2009-01-14 19:55:15 +0100
    message:
      Remove subvertpy, rely on external installation.
    removed:
      subvertpy/                     subvertpy-20081002184530-hz9mrr3wqq4l8qdx-1
      subvertpy/.bzrignore           bzrignore-20081002201329-yj9jf0hmrtdpfw0u-1
      subvertpy/AUTHORS              authors-20081002184818-kozkud4dvhmbez8a-1
      subvertpy/COPYING              copying-20081002184826-7ve43dwedsm8e0eh-1
      subvertpy/Makefile             makefile-20081002202532-xkdtg6p584inuoya-1
      subvertpy/NEWS                 news-20090113174653-ql3s5yzrzialtlpr-1
      subvertpy/TODO                 todo-20081005190627-4brj2368nxwmb0bp-1
      subvertpy/examples/            examples-20081113151832-xkzjiy3n4svpd7a2-1
      subvertpy/examples/log.py      log.py-20081113151832-xkzjiy3n4svpd7a2-2
      subvertpy/setup.py             setup.py-20060502115218-86950492da22353f
      subvertpy/subvertpy/           subvertpy-20081002201834-3k5r8h3ri3kzrzp6-1
      subvertpy/subvertpy/__init__.py core.pyx-20080313210413-17k59slolpfe5kdq-1
      subvertpy/subvertpy/_ra.c      ra.pyx-20080313140933-qybkqaxe3m4mcll7-1
      subvertpy/subvertpy/client.c   client.pyx-20080313235339-wbyjbw2namuiql8f-1
      subvertpy/subvertpy/delta.py   delta.py-20080316001917-xyng7m3jlxvdc4c9-1
      subvertpy/subvertpy/editor.c   editor.c-20080602191336-frj7az1sdk13o1tw-1
      subvertpy/subvertpy/editor.h   editor.h-20080602191336-frj7az1sdk13o1tw-2
      subvertpy/subvertpy/marshall.py marshall.py-20081006140850-jzf2dbt55rwefdqm-1
      subvertpy/subvertpy/properties.py util.py-20080502170127-o220e9py99vt69s6-1
      subvertpy/subvertpy/ra.h       ra.h-20080621214350-wlaxxs087eiu02me-1
      subvertpy/subvertpy/ra.py      ra.py-20081116162923-6yq5jahxp5y23n5t-1
      subvertpy/subvertpy/ra_svn.py  ra_svn.py-20081116165419-qplciag3b7ikc6ms-1
      subvertpy/subvertpy/repos.c    repos.pyx-20080314114432-g2b5lqe776tkbl4k-1
      subvertpy/subvertpy/server.py  server.py-20081006143330-f9p0l7eih6izgoct-1
      subvertpy/subvertpy/stdbool.h  stdbool.h-20080727235015-yn3xnbkxaaluvzd0-1
      subvertpy/subvertpy/tests/     tests-20081002184840-6jfgc90zdhmmcny2-1
      subvertpy/subvertpy/tests/__init__.py __init__.py-20081002194117-jwf9payoee8eqz7g-1
      subvertpy/subvertpy/tests/test_client.py test_client.py-20080603021344-lmgexez0yoyp9b1s-1
      subvertpy/subvertpy/tests/test_core.py test_core.py-20080603032119-q91zmret1lv84ay9-1
      subvertpy/subvertpy/tests/test_delta.py test_delta.py-20080710120654-bqapu1ccex72nwdk-1
      subvertpy/subvertpy/tests/test_marshall.py test_marshall.py-20081006140936-tuh5e2o2httgadkd-1
      subvertpy/subvertpy/tests/test_properties.py test_properties.py-20080703215223-t5ydp87wwi7dtyas-1
      subvertpy/subvertpy/tests/test_ra.py test_ra.py-20080313141743-uzsm7ejitrlqone5-1
      subvertpy/subvertpy/tests/test_repos.py test_repos.py-20080603030558-86ewiakm2z5y9x29-1
      subvertpy/subvertpy/tests/test_server.py test_server.py-20081006150547-hj71pjqjdq4a89kf-1
      subvertpy/subvertpy/tests/test_wc.py test_wc.py-20080313142315-woibd1cdv4s2lr7o-1
      subvertpy/subvertpy/util.c     util.c-20080531154025-s8ef6ej9tytsnkkw-1
      subvertpy/subvertpy/util.h     util.h-20080531154025-s8ef6ej9tytsnkkw-2
      subvertpy/subvertpy/wc.c       wc.pyx-20080313142018-10l8l23vha2j9e6b-1
      subvertpy/subvertpy/wc.h       wc.h-20080622050149-ir7xe34a497adbmp-1
    modified:
      INSTALL                        install-20080708203223-nbfwz4aneslpdz5g-1
      NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
      __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
      setup.py                       setup.py-20081002195455-nascfq8sx5o40xap-1
    ------------------------------------------------------------
    revno: 220.81.634
    revision-id: jelmer at samba.org-20090114183223-ajmt87iurn1ln40l
    parent: jelmer at samba.org-20090114180105-3jab2wtm7z5rm5ye
    parent: jelmer at samba.org-20090114163015-whb34wkexi40y08c
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.5
    timestamp: Wed 2009-01-14 19:32:23 +0100
    message:
      merge upstream.
    modified:
      revmeta.py                     revmeta.py-20080901215045-n8a6arqybs9ez5hl-1
      tests/test_workingtree.py      test_workingtree.py-20060622191524-0di7bc3q1ckdbybb-1
      workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
        ------------------------------------------------------------
        revno: 220.97.3
        revision-id: jelmer at samba.org-20090114163015-whb34wkexi40y08c
        parent: jelmer at samba.org-20090114162054-y2egcljye2ukf34p
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: 0.5
        timestamp: Wed 2009-01-14 17:30:15 +0100
        message:
          Better locking.
        modified:
          workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
        ------------------------------------------------------------
        revno: 220.97.2
        revision-id: jelmer at samba.org-20090114162054-y2egcljye2ukf34p
        parent: jelmer at samba.org-20090114005302-53fi1b5lpy38e847
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: 0.5
        timestamp: Wed 2009-01-14 17:20:54 +0100
        message:
          Add test for 304134, based on Wesley's test script.
        modified:
          tests/test_workingtree.py      test_workingtree.py-20060622191524-0di7bc3q1ckdbybb-1
        ------------------------------------------------------------
        revno: 220.97.1
        revision-id: jelmer at samba.org-20090114005302-53fi1b5lpy38e847
        parent: jelmer at samba.org-20090113162520-gzv3mg8t2hgl095h
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: 0.5
        timestamp: Wed 2009-01-14 01:53:02 +0100
        message:
          keep metabranches history more sparse to avoid iterating over lots of empty entries.
        modified:
          revmeta.py                     revmeta.py-20080901215045-n8a6arqybs9ez5hl-1
    ------------------------------------------------------------
    revno: 220.81.633
    revision-id: jelmer at samba.org-20090114180105-3jab2wtm7z5rm5ye
    parent: jelmer at samba.org-20090114174946-0l9iy000huh9myhe
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.5
    timestamp: Wed 2009-01-14 19:01:05 +0100
    message:
      Merge changes from subvertpy.
    modified:
      subvertpy/setup.py             setup.py-20060502115218-86950492da22353f
      subvertpy/subvertpy/delta.py   delta.py-20080316001917-xyng7m3jlxvdc4c9-1
    ------------------------------------------------------------
    revno: 220.81.632
    revision-id: jelmer at samba.org-20090114174946-0l9iy000huh9myhe
    parent: jelmer at samba.org-20090113162520-gzv3mg8t2hgl095h
    parent: jelmer at samba.org-20090113174705-rak69em21zi39e1t
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.5
    timestamp: Wed 2009-01-14 18:49:46 +0100
    message:
      Merge new subvertpy (relicensed to GPLv2+).
    added:
      subvertpy/NEWS                 news-20090113174653-ql3s5yzrzialtlpr-1
    modified:
      subvertpy/COPYING              copying-20081002184826-7ve43dwedsm8e0eh-1
      subvertpy/setup.py             setup.py-20060502115218-86950492da22353f
      subvertpy/subvertpy/__init__.py core.pyx-20080313210413-17k59slolpfe5kdq-1
      subvertpy/subvertpy/client.c   client.pyx-20080313235339-wbyjbw2namuiql8f-1
      subvertpy/subvertpy/properties.py util.py-20080502170127-o220e9py99vt69s6-1
      subvertpy/subvertpy/ra.py      ra.py-20081116162923-6yq5jahxp5y23n5t-1
      subvertpy/subvertpy/ra_svn.py  ra_svn.py-20081116165419-qplciag3b7ikc6ms-1
      subvertpy/subvertpy/tests/__init__.py __init__.py-20081002194117-jwf9payoee8eqz7g-1
      subvertpy/subvertpy/tests/test_client.py test_client.py-20080603021344-lmgexez0yoyp9b1s-1
      subvertpy/subvertpy/tests/test_core.py test_core.py-20080603032119-q91zmret1lv84ay9-1
      subvertpy/subvertpy/tests/test_delta.py test_delta.py-20080710120654-bqapu1ccex72nwdk-1
      subvertpy/subvertpy/tests/test_properties.py test_properties.py-20080703215223-t5ydp87wwi7dtyas-1
      subvertpy/subvertpy/tests/test_ra.py test_ra.py-20080313141743-uzsm7ejitrlqone5-1
      subvertpy/subvertpy/tests/test_repos.py test_repos.py-20080603030558-86ewiakm2z5y9x29-1
      subvertpy/subvertpy/tests/test_server.py test_server.py-20081006150547-hj71pjqjdq4a89kf-1
      subvertpy/subvertpy/tests/test_wc.py test_wc.py-20080313142315-woibd1cdv4s2lr7o-1
      subvertpy/subvertpy/wc.c       wc.pyx-20080313142018-10l8l23vha2j9e6b-1
    ------------------------------------------------------------
    revno: 220.91.51
    tags: subvertpy-0.6.0
    revision-id: jelmer at samba.org-20090113174705-rak69em21zi39e1t
    parent: jelmer at samba.org-20090109174428-u9d2fwayekl7ojoe
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Tue 2009-01-13 18:47:05 +0100
    message:
      Release 0.6.0.
    added:
      NEWS                           news-20090113174653-ql3s5yzrzialtlpr-1
    modified:
      setup.py                       setup.py-20060502115218-86950492da22353f
      subvertpy/__init__.py          core.pyx-20080313210413-17k59slolpfe5kdq-1
    ------------------------------------------------------------
    revno: 220.91.50
    revision-id: jelmer at samba.org-20090109174428-u9d2fwayekl7ojoe
    parent: jelmer at samba.org-20090104191732-16r6moir8n2c8s81
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Fri 2009-01-09 18:44:28 +0100
    message:
      Make sure reference counting is one on Py_None.
    modified:
      subvertpy/wc.c                 wc.pyx-20080313142018-10l8l23vha2j9e6b-1
    ------------------------------------------------------------
    revno: 220.91.49
    revision-id: jelmer at samba.org-20090104191732-16r6moir8n2c8s81
    parent: jelmer at samba.org-20090104180254-l2d1m6wszs5fxcqw
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Sun 2009-01-04 20:17:32 +0100
    message:
      Add more docstrings.
    modified:
      subvertpy/wc.c                 wc.pyx-20080313142018-10l8l23vha2j9e6b-1
    ------------------------------------------------------------
    revno: 220.91.48
    revision-id: jelmer at samba.org-20090104180254-l2d1m6wszs5fxcqw
    parent: jelmer at samba.org-20090104180110-4w5o11ouopp5kmph
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Sun 2009-01-04 19:02:54 +0100
    message:
      Change license back to GPLv2+, not just GPLv3+.
    modified:
      COPYING                        copying-20081002184826-7ve43dwedsm8e0eh-1
      setup.py                       setup.py-20060502115218-86950492da22353f
      subvertpy/__init__.py          core.pyx-20080313210413-17k59slolpfe5kdq-1
      subvertpy/properties.py        util.py-20080502170127-o220e9py99vt69s6-1
      subvertpy/ra.py                ra.py-20081116162923-6yq5jahxp5y23n5t-1
      subvertpy/ra_svn.py            ra_svn.py-20081116165419-qplciag3b7ikc6ms-1
      subvertpy/tests/__init__.py    __init__.py-20081002194117-jwf9payoee8eqz7g-1
      subvertpy/tests/test_client.py test_client.py-20080603021344-lmgexez0yoyp9b1s-1
      subvertpy/tests/test_core.py   test_core.py-20080603032119-q91zmret1lv84ay9-1
      subvertpy/tests/test_delta.py  test_delta.py-20080710120654-bqapu1ccex72nwdk-1
      subvertpy/tests/test_properties.py test_properties.py-20080703215223-t5ydp87wwi7dtyas-1
      subvertpy/tests/test_ra.py     test_ra.py-20080313141743-uzsm7ejitrlqone5-1
      subvertpy/tests/test_repos.py  test_repos.py-20080603030558-86ewiakm2z5y9x29-1
      subvertpy/tests/test_server.py test_server.py-20081006150547-hj71pjqjdq4a89kf-1
      subvertpy/tests/test_wc.py     test_wc.py-20080313142315-woibd1cdv4s2lr7o-1
    ------------------------------------------------------------
    revno: 220.91.47
    revision-id: jelmer at samba.org-20090104180110-4w5o11ouopp5kmph
    parent: jelmer at samba.org-20081212155142-8o4ajif6v7c11ic5
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Sun 2009-01-04 19:01:10 +0100
    message:
      Add some basic docstrings.
    modified:
      subvertpy/client.c             client.pyx-20080313235339-wbyjbw2namuiql8f-1
      subvertpy/wc.c                 wc.pyx-20080313142018-10l8l23vha2j9e6b-1

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



More information about the bazaar-commits mailing list