Rev 1262: merge 0.4. in http://people.samba.org/bzr/jelmer/bzr-svn/svn-1.5

Jelmer Vernooij jelmer at samba.org
Mon Jul 21 20:56:14 BST 2008


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

------------------------------------------------------------
revno: 1262
revision-id: jelmer at samba.org-20080721195611-xmm0tffdmmwooye9
parent: jelmer at samba.org-20080707112911-fca6wpxr457n690x
parent: jelmer at samba.org-20080721194233-3mq364sd27qvy3cu
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: svn-1.5
timestamp: Mon 2008-07-21 21:56:11 +0200
message:
  merge 0.4.
added:
  HACKING                        hacking-20080708205120-2zt6hljftpjuilig-1
  INSTALL                        install-20080708203223-nbfwz4aneslpdz5g-1
  log.py                         log.py-20080707143400-mxzjdllay5jhvnq1-1
  tests/test_delta.py            test_delta.py-20080710120654-bqapu1ccex72nwdk-1
  tests/test_log.py              test_log.py-20080707150233-jwwy10h0byik6jxj-1
  wiki.py                        wiki.py-20080708205255-vpo68letts9127kb-1
modified:
  AUTHORS                        AUTHORS-20060508114718-4c90c0062645106d
  FAQ                            faq-20070910195147-p9u38s9wplds2d4o-1
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  README                         README-20051120210643-bd274a2fef9aed6a
  __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
  branch.py                      svnbranch.py-20051017135706-11c749eb0dab04a7
  config.py                      config.py-20070624185721-0j8f1ly75uo4s1lk-1
  errors.py                      errors.py-20061226172623-w1sbj8ynpo0eojqp-1
  fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
  format.py                      format.py-20070917005147-94kb7zysotf82kqw-1
  logwalker.py                   logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
  mapping.py                     mapping.py-20080128201303-6cp01phc0dmc0kiv-1
  mapping3/__init__.py           __init__.py-20080502174630-9324zh25kka98vlw-1
  mapping3/scheme.py             scheme.py-20060516195850-95181aae6b272f9e
  parents.py                     parents.py-20080505192113-5rcif033d6wcam9w-1
  properties.py                  util.py-20080502170127-o220e9py99vt69s6-1
  remote.py                      format.py-20060406233823-b6fa009fe35dfde7
  repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
  revids.py                      revids.py-20070416220458-36vfa0730cchevp1-1
  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_config.py           test_config.py-20070624193244-itvnst60evjidr4z-1
  tests/test_convert.py          test_convert.py-20060705203611-b1l0bapeku6foco0-1
  tests/test_fetch.py            test_fetch.py-20070624210302-luvgwjmlfysk5qeq-1
  tests/test_fileids.py          test_fileids.py-20060622131341-19gyrlgqy8yl2od5-1
  tests/test_properties.py       test_properties.py-20080703215223-t5ydp87wwi7dtyas-1
  tests/test_push.py             test_push.py-20070201165715-g2ievcdfqi33wqsy-1
  tests/test_repository.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_tree.py             test_tree.py-20070103204350-pr8nupes7e5sd2wr-1
  tests/test_versionedfiles.py   test_versionedfiles.-20080626153242-v0c6uolklpux67a1-1
  transport.py                   transport.py-20060406231150-b3472d06b3a0818d
  tree.py                        tree.py-20060624222557-dudlwqcmkf22lt2s-1
  versionedfiles.py              versionedfiles.py-20080626134117-j8g0ntz1pj228iox-1
  wc.c                           wc.pyx-20080313142018-10l8l23vha2j9e6b-1
  workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
    ------------------------------------------------------------
    revno: 1196.1.286
    revision-id: jelmer at samba.org-20080721194233-3mq364sd27qvy3cu
    parent: jelmer at samba.org-20080719132004-3gc90uor5idh58b0
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2008-07-21 21:42:33 +0200
    message:
      Add extra progress reporting.
    modified:
      repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
    ------------------------------------------------------------
    revno: 1196.1.285
    revision-id: jelmer at samba.org-20080719132004-3gc90uor5idh58b0
    parent: jelmer at samba.org-20080719131741-ncewn2gsp0vmz6uf
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sat 2008-07-19 15:20:04 +0200
    message:
      Remove unused import.
    modified:
      repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
    ------------------------------------------------------------
    revno: 1196.1.284
    revision-id: jelmer at samba.org-20080719131741-ncewn2gsp0vmz6uf
    parent: jelmer at samba.org-20080718153822-pewpcrslzym1be24
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sat 2008-07-19 15:17:41 +0200
    message:
      Fix push on top of non-lhs revisions.
    modified:
      branch.py                      svnbranch.py-20051017135706-11c749eb0dab04a7
      tests/test_push.py             test_push.py-20070201165715-g2ievcdfqi33wqsy-1
    ------------------------------------------------------------
    revno: 1196.1.283
    revision-id: jelmer at samba.org-20080718153822-pewpcrslzym1be24
    parent: jelmer at samba.org-20080717164639-g9p8wks1rchmgobk
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2008-07-18 17:38:22 +0200
    message:
      Revert accidently committed change.
    modified:
      fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
    ------------------------------------------------------------
    revno: 1196.1.282
    revision-id: jelmer at samba.org-20080717164639-g9p8wks1rchmgobk
    parent: jelmer at samba.org-20080717160751-eg2sqhqj40ktz153
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Thu 2008-07-17 18:46:39 +0200
    message:
      Deliver encoded paths in URLs to Subversion in switch() and reparent() functions.
    modified:
      NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
      fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
      transport.py                   transport.py-20060406231150-b3472d06b3a0818d
    ------------------------------------------------------------
    revno: 1196.1.281
    revision-id: jelmer at samba.org-20080717160751-eg2sqhqj40ktz153
    parent: jelmer at samba.org-20080717132317-9qs9gzc76q4hcsv1
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Thu 2008-07-17 18:07:51 +0200
    message:
      Fix ignore list generation.
    modified:
      fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
      workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
    ------------------------------------------------------------
    revno: 1196.1.280
    revision-id: jelmer at samba.org-20080717132317-9qs9gzc76q4hcsv1
    parent: jelmer at samba.org-20080717125257-wb8ihlyhw96shmup
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Thu 2008-07-17 15:23:17 +0200
    message:
      Fix path separator in ignores.
    modified:
      workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
    ------------------------------------------------------------
    revno: 1196.1.279
    revision-id: jelmer at samba.org-20080717125257-wb8ihlyhw96shmup
    parent: jelmer at samba.org-20080716145324-8drjvzg48qem4udt
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Thu 2008-07-17 14:52:57 +0200
    message:
      Use VirtualVersionedFiles implementation from Bazaar.
    modified:
      tests/test_versionedfiles.py   test_versionedfiles.-20080626153242-v0c6uolklpux67a1-1
      versionedfiles.py              versionedfiles.py-20080626134117-j8g0ntz1pj228iox-1
    ------------------------------------------------------------
    revno: 1196.1.278
    revision-id: jelmer at samba.org-20080716145324-8drjvzg48qem4udt
    parent: jelmer at samba.org-20080716144731-4t62kpo1uv4q2vuw
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Wed 2008-07-16 16:53:24 +0200
    message:
      Fix installation of the .so files.
    modified:
      setup.py                       setup.py-20060502115218-86950492da22353f
    ------------------------------------------------------------
    revno: 1196.1.277
    revision-id: jelmer at samba.org-20080716144731-4t62kpo1uv4q2vuw
    parent: jelmer at samba.org-20080715140623-nsjbmbw2ca0cteps
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Wed 2008-07-16 16:47:31 +0200
    message:
      Fix name of get_stacked_on function.
    modified:
      branch.py                      svnbranch.py-20051017135706-11c749eb0dab04a7
    ------------------------------------------------------------
    revno: 1196.1.276
    revision-id: jelmer at samba.org-20080715140623-nsjbmbw2ca0cteps
    parent: jelmer at samba.org-20080715135756-t15l2a2dx2xv9dka
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-07-15 16:06:23 +0200
    message:
      Remove use of svn+ prefix.
    modified:
      tests/test_branch.py           test_branch.py-20060508162215-74ffeb5d608f8e20
      tests/test_convert.py          test_convert.py-20060705203611-b1l0bapeku6foco0-1
      tests/test_fetch.py            test_fetch.py-20070624210302-luvgwjmlfysk5qeq-1
      tests/test_fileids.py          test_fileids.py-20060622131341-19gyrlgqy8yl2od5-1
      tests/test_repository.py       test_repos.py-20060508151940-ddc49a59257ca712
    ------------------------------------------------------------
    revno: 1196.1.275
    revision-id: jelmer at samba.org-20080715135756-t15l2a2dx2xv9dka
    parent: jelmer at samba.org-20080710120831-te5c6dy2wqyt0hyz
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-07-15 15:57:56 +0200
    message:
      Fix running tests with svn 1.4.
    modified:
      tests/__init__.py              __init__.py-20060508151940-e9f4d914801a2535
    ------------------------------------------------------------
    revno: 1196.1.274
    revision-id: jelmer at samba.org-20080710120831-te5c6dy2wqyt0hyz
    parent: jelmer at samba.org-20080710013805-11g2tqdq4u3kmrh9
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Thu 2008-07-10 14:08:31 +0200
    message:
      Add initial test for delta code.
    added:
      tests/test_delta.py            test_delta.py-20080710120654-bqapu1ccex72nwdk-1
    modified:
      tests/__init__.py              __init__.py-20060508151940-e9f4d914801a2535
    ------------------------------------------------------------
    revno: 1196.1.273
    revision-id: jelmer at samba.org-20080710013805-11g2tqdq4u3kmrh9
    parent: jelmer at samba.org-20080710011255-wf8vlrtq3a3pjelr
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Thu 2008-07-10 03:38:05 +0200
    message:
      Implement iter for lazy_dict.
    modified:
      logwalker.py                   logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
    ------------------------------------------------------------
    revno: 1196.1.272
    revision-id: jelmer at samba.org-20080710011255-wf8vlrtq3a3pjelr
    parent: jelmer at samba.org-20080709024405-wppxt2e8yxttvkns
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Thu 2008-07-10 03:12:55 +0200
    message:
      Implement __delitem__.
    modified:
      logwalker.py                   logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
    ------------------------------------------------------------
    revno: 1196.1.271
    revision-id: jelmer at samba.org-20080709024405-wppxt2e8yxttvkns
    parent: jelmer at samba.org-20080709023107-rngjm7vgrtv0956g
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Wed 2008-07-09 04:44:05 +0200
    message:
      Add exception for invalidly added bzrsvn revisions.
    modified:
      errors.py                      errors.py-20061226172623-w1sbj8ynpo0eojqp-1
      revids.py                      revids.py-20070416220458-36vfa0730cchevp1-1
    ------------------------------------------------------------
    revno: 1196.1.270
    revision-id: jelmer at samba.org-20080709023107-rngjm7vgrtv0956g
    parent: jelmer at samba.org-20080709022611-7umujonxkz54ih0t
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Wed 2008-07-09 04:31:07 +0200
    message:
      Cope with ghosts.
    modified:
      fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
    ------------------------------------------------------------
    revno: 1196.1.269
    revision-id: jelmer at samba.org-20080709022611-7umujonxkz54ih0t
    parent: jelmer at samba.org-20080709014941-bjflb934qw83j628
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Wed 2008-07-09 04:26:11 +0200
    message:
      use parents cache when possible.
    modified:
      fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
      parents.py                     parents.py-20080505192113-5rcif033d6wcam9w-1
      repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
    ------------------------------------------------------------
    revno: 1196.1.268
    revision-id: jelmer at samba.org-20080709014941-bjflb934qw83j628
    parent: jelmer at samba.org-20080709000653-alsm8t08s6h92i15
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Wed 2008-07-09 03:49:41 +0200
    message:
      Use common parent id functions.
    modified:
      __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
      fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
      repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
      tests/test_blackbox.py         test_blackbox.py-20070325150839-d10llf8arptpcfl6-1
    ------------------------------------------------------------
    revno: 1196.1.267
    revision-id: jelmer at samba.org-20080709000653-alsm8t08s6h92i15
    parent: jelmer at samba.org-20080708232817-4lwmcepwz0tn4kw1
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Wed 2008-07-09 02:06:53 +0200
    message:
      Fix tests.
    modified:
      __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
      mapping3/__init__.py           __init__.py-20080502174630-9324zh25kka98vlw-1
      tests/test_config.py           test_config.py-20070624193244-itvnst60evjidr4z-1
    ------------------------------------------------------------
    revno: 1196.1.266
    revision-id: jelmer at samba.org-20080708232817-4lwmcepwz0tn4kw1
    parent: jelmer at samba.org-20080708225528-zefeb8gyxp63kp6v
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Wed 2008-07-09 01:28:17 +0200
    message:
      Warn when trying to clone a repository root as a branch.
    modified:
      NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
      config.py                      config.py-20070624185721-0j8f1ly75uo4s1lk-1
      mapping3/__init__.py           __init__.py-20080502174630-9324zh25kka98vlw-1
      remote.py                      format.py-20060406233823-b6fa009fe35dfde7
      repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
    ------------------------------------------------------------
    revno: 1196.1.265
    revision-id: jelmer at samba.org-20080708225528-zefeb8gyxp63kp6v
    parent: jelmer at samba.org-20080708225201-lgdswg47xv79ivh4
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Wed 2008-07-09 00:55:28 +0200
    message:
      Avoid setting branching-scheme-mandatory if possible.
    modified:
      config.py                      config.py-20070624185721-0j8f1ly75uo4s1lk-1
    ------------------------------------------------------------
    revno: 1196.1.264
    revision-id: jelmer at samba.org-20080708225201-lgdswg47xv79ivh4
    parent: jelmer at samba.org-20080708215518-gz0gzc3c074s3cio
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Wed 2008-07-09 00:52:01 +0200
    message:
      Update docs.
    modified:
      FAQ                            faq-20070910195147-p9u38s9wplds2d4o-1
      __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
    ------------------------------------------------------------
    revno: 1196.1.263
    revision-id: jelmer at samba.org-20080708215518-gz0gzc3c074s3cio
    parent: jelmer at samba.org-20080708214851-b2jk4v4wtvfo0o15
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-07-08 23:55:18 +0200
    message:
      Move info message to avoid confusing when specifying a branch.
    modified:
      __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
    ------------------------------------------------------------
    revno: 1196.1.262
    revision-id: jelmer at samba.org-20080708214851-b2jk4v4wtvfo0o15
    parent: jelmer at samba.org-20080708213518-32utrv03rn5gcnc7
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-07-08 23:48:51 +0200
    message:
      Pass guessed scheme around in a couple more places.
    modified:
      __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
      mapping3/__init__.py           __init__.py-20080502174630-9324zh25kka98vlw-1
    ------------------------------------------------------------
    revno: 1196.1.261
    revision-id: jelmer at samba.org-20080708213518-32utrv03rn5gcnc7
    parent: jelmer at samba.org-20080708212117-2xx5n6g9soav16cq
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-07-08 23:35:18 +0200
    message:
      Pass guess branching scheme back as well as best matching scheme.
    modified:
      mapping3/__init__.py           __init__.py-20080502174630-9324zh25kka98vlw-1
      mapping3/scheme.py             scheme.py-20060516195850-95181aae6b272f9e
      tests/test_scheme.py           test_scheme.py-20060621221855-va2xabhlxpmc9llx-1
    ------------------------------------------------------------
    revno: 1196.1.260
    revision-id: jelmer at samba.org-20080708212117-2xx5n6g9soav16cq
    parent: jelmer at samba.org-20080708210751-wyuqaq07kcv9v5vc
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-07-08 23:21:17 +0200
    message:
      Update docs
    modified:
      README                         README-20051120210643-bd274a2fef9aed6a
      __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
    ------------------------------------------------------------
    revno: 1196.1.259
    revision-id: jelmer at samba.org-20080708210751-wyuqaq07kcv9v5vc
    parent: jelmer at samba.org-20080708205354-j69zg5w3si444cc0
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-07-08 23:07:51 +0200
    message:
      Extend 'bzr help svn'
    modified:
      NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
      __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
    ------------------------------------------------------------
    revno: 1196.1.258
    revision-id: jelmer at samba.org-20080708205354-j69zg5w3si444cc0
    parent: jelmer at samba.org-20080708204347-qzv98aqu4ts85idh
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-07-08 22:53:54 +0200
    message:
      Add script for generating wiki page.
    added:
      HACKING                        hacking-20080708205120-2zt6hljftpjuilig-1
      wiki.py                        wiki.py-20080708205255-vpo68letts9127kb-1
    modified:
      INSTALL                        install-20080708203223-nbfwz4aneslpdz5g-1
      README                         README-20051120210643-bd274a2fef9aed6a
    ------------------------------------------------------------
    revno: 1196.1.257
    revision-id: jelmer at samba.org-20080708204347-qzv98aqu4ts85idh
    parent: jelmer at samba.org-20080708190933-xp7we17afsbhmx6v
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-07-08 22:43:47 +0200
    message:
      Split installation instructions out of README.
    added:
      INSTALL                        install-20080708203223-nbfwz4aneslpdz5g-1
    modified:
      README                         README-20051120210643-bd274a2fef9aed6a
    ------------------------------------------------------------
    revno: 1196.1.256
    revision-id: jelmer at samba.org-20080708190933-xp7we17afsbhmx6v
    parent: jelmer at samba.org-20080708171058-n17oznut3ekjtvjh
    parent: jelmer at samba.org-20080708184954-kl1dk5e8wkxol4we
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-07-08 21:09:33 +0200
    message:
      Cope with files that are special files but not symlinks.
    modified:
      NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
      fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
      tests/test_fetch.py            test_fetch.py-20070624210302-luvgwjmlfysk5qeq-1
      tests/test_tree.py             test_tree.py-20070103204350-pr8nupes7e5sd2wr-1
      tree.py                        tree.py-20060624222557-dudlwqcmkf22lt2s-1
        ------------------------------------------------------------
        revno: 1196.21.1
        revision-id: jelmer at samba.org-20080708184954-kl1dk5e8wkxol4we
        parent: jelmer at samba.org-20080708171058-n17oznut3ekjtvjh
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: 0.4
        timestamp: Tue 2008-07-08 20:49:54 +0200
        message:
          Use new commit editor api.
        modified:
          tests/test_fetch.py            test_fetch.py-20070624210302-luvgwjmlfysk5qeq-1
    ------------------------------------------------------------
    revno: 1196.1.255
    revision-id: jelmer at samba.org-20080708171058-n17oznut3ekjtvjh
    parent: jelmer at samba.org-20080707224641-cdyimns3q451ty9s
    parent: jelmer at samba.org-20080708162250-1ojxu79jlu4z599c
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-07-08 19:10:58 +0200
    message:
      Merge upstream.
    modified:
      NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
      README                         README-20051120210643-bd274a2fef9aed6a
      fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
      format.py                      format.py-20070917005147-94kb7zysotf82kqw-1
      properties.py                  util.py-20080502170127-o220e9py99vt69s6-1
      tests/test_fetch.py            test_fetch.py-20070624210302-luvgwjmlfysk5qeq-1
      tests/test_properties.py       test_properties.py-20080703215223-t5ydp87wwi7dtyas-1
      wc.c                           wc.pyx-20080313142018-10l8l23vha2j9e6b-1
        ------------------------------------------------------------
        revno: 1196.20.6
        revision-id: jelmer at samba.org-20080708162250-1ojxu79jlu4z599c
        parent: jelmer at samba.org-20080708150150-b28wq2wnnrdkzrcg
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: 0.4
        timestamp: Tue 2008-07-08 18:22:50 +0200
        message:
          Add some assertions.
        modified:
          fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
        ------------------------------------------------------------
        revno: 1196.20.5
        revision-id: jelmer at samba.org-20080708150150-b28wq2wnnrdkzrcg
        parent: jelmer at samba.org-20080708134532-ziqy0wcjc43r2911
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: 0.4
        timestamp: Tue 2008-07-08 17:01:50 +0200
        message:
          Clarify nested tree status.
        modified:
          README                         README-20051120210643-bd274a2fef9aed6a
        ------------------------------------------------------------
        revno: 1196.20.4
        revision-id: jelmer at samba.org-20080708134532-ziqy0wcjc43r2911
        parent: jelmer at samba.org-20080708132143-ge6ulosbu931e1gc
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: 0.4
        timestamp: Tue 2008-07-08 15:45:32 +0200
        message:
          Convert to new API.
        modified:
          tests/test_fetch.py            test_fetch.py-20070624210302-luvgwjmlfysk5qeq-1
        ------------------------------------------------------------
        revno: 1196.20.3
        revision-id: jelmer at samba.org-20080708132143-ge6ulosbu931e1gc
        parent: jelmer at samba.org-20080708005739-cvii1sajo4edx4zx
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: 0.4
        timestamp: Tue 2008-07-08 15:21:43 +0200
        message:
          Merge properties code improvements.
        modified:
          format.py                      format.py-20070917005147-94kb7zysotf82kqw-1
          properties.py                  util.py-20080502170127-o220e9py99vt69s6-1
          tests/test_properties.py       test_properties.py-20080703215223-t5ydp87wwi7dtyas-1
        ------------------------------------------------------------
        revno: 1196.20.2
        revision-id: jelmer at samba.org-20080708005739-cvii1sajo4edx4zx
        parent: jelmer at samba.org-20080708003135-t7e195i71y8cxaom
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: 0.4
        timestamp: Tue 2008-07-08 02:57:39 +0200
        message:
          Canonicalize path.
        modified:
          wc.c                           wc.pyx-20080313142018-10l8l23vha2j9e6b-1
        ------------------------------------------------------------
        revno: 1196.20.1
        revision-id: jelmer at samba.org-20080708003135-t7e195i71y8cxaom
        parent: jelmer at samba.org-20080707224641-cdyimns3q451ty9s
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: 0.4
        timestamp: Tue 2008-07-08 02:31:35 +0200
        message:
          Fix extra entry in NEWS.
        modified:
          NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
    ------------------------------------------------------------
    revno: 1196.1.254
    revision-id: jelmer at samba.org-20080707224641-cdyimns3q451ty9s
    parent: jelmer at samba.org-20080707173455-ugl6vgfzvv1t6q39
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-07-08 00:46:41 +0200
    message:
      Fix regression in executable bits.
    modified:
      fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
      tests/test_fetch.py            test_fetch.py-20070624210302-luvgwjmlfysk5qeq-1
    ------------------------------------------------------------
    revno: 1196.1.253
    revision-id: jelmer at samba.org-20080707173455-ugl6vgfzvv1t6q39
    parent: jelmer at samba.org-20080707171055-g9guz745ynx35b2g
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2008-07-07 19:34:55 +0200
    message:
      Fix formatting.
    modified:
      NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
    ------------------------------------------------------------
    revno: 1196.1.252
    revision-id: jelmer at samba.org-20080707171055-g9guz745ynx35b2g
    parent: jelmer at samba.org-20080707171029-y9mxy5d30tbst29i
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2008-07-07 19:10:55 +0200
    message:
      Convert permission denied errors properly.
    modified:
      transport.py                   transport.py-20060406231150-b3472d06b3a0818d
    ------------------------------------------------------------
    revno: 1196.1.251
    revision-id: jelmer at samba.org-20080707171029-y9mxy5d30tbst29i
    parent: jelmer at samba.org-20080707160901-u7vvud3pzlczqscn
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2008-07-07 19:10:29 +0200
    message:
      Support more arguments for wc.
    modified:
      workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
    ------------------------------------------------------------
    revno: 1196.1.250
    revision-id: jelmer at samba.org-20080707160901-u7vvud3pzlczqscn
    parent: jelmer at samba.org-20080707160451-kuwuwzx06dulnq49
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2008-07-07 18:09:01 +0200
    message:
      Avoid creating checkout in more cases.
    modified:
      tests/test_transport.py        test_transport.py-20060621232111-xh7xvoblzsrgj79t-1
    ------------------------------------------------------------
    revno: 1196.1.249
    revision-id: jelmer at samba.org-20080707160451-kuwuwzx06dulnq49
    parent: jelmer at samba.org-20080707150613-lbw0fzlf5dgb0d1q
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2008-07-07 18:04:51 +0200
    message:
      Use commit editor API in a couple more places.
    modified:
      tests/test_push.py             test_push.py-20070201165715-g2ievcdfqi33wqsy-1
    ------------------------------------------------------------
    revno: 1196.1.248
    revision-id: jelmer at samba.org-20080707150613-lbw0fzlf5dgb0d1q
    parent: jelmer at samba.org-20080707145706-9ay97prybptjh9sh
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2008-07-07 17:06:13 +0200
    message:
      Add tests for new log functionality.
    added:
      tests/test_log.py              test_log.py-20080707150233-jwwy10h0byik6jxj-1
    modified:
      tests/__init__.py              __init__.py-20060508151940-e9f4d914801a2535
    ------------------------------------------------------------
    revno: 1196.1.247
    revision-id: jelmer at samba.org-20080707145706-9ay97prybptjh9sh
    parent: jelmer at samba.org-20080707145525-6r5mr2kge9v9lf33
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2008-07-07 16:57:06 +0200
    message:
      Thank Guillermo for adding custom property support.
    modified:
      AUTHORS                        AUTHORS-20060508114718-4c90c0062645106d
    ------------------------------------------------------------
    revno: 1196.1.246
    revision-id: jelmer at samba.org-20080707145525-6r5mr2kge9v9lf33
    parent: jelmer at samba.org-20080707005756-52jnh4zu0zqitetw
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2008-07-07 16:55:25 +0200
    message:
      Show subversion revision numbers in bzr log.
    added:
      log.py                         log.py-20080707143400-mxzjdllay5jhvnq1-1
    modified:
      NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
      __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
      mapping.py                     mapping.py-20080128201303-6cp01phc0dmc0kiv-1
      repository.py                  repository.py-20060306123302-1f8c5069b3fe0265

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



More information about the bazaar-commits mailing list