Rev 1260: Merge 0.4. in http://people.samba.org/bzr/jelmer/bzr-svn/svn-1.5

Jelmer Vernooij jelmer at samba.org
Mon Jul 7 11:25:21 BST 2008


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

------------------------------------------------------------
revno: 1260
revision-id: jelmer at samba.org-20080707102514-9jkb1b7k9e504cxd
parent: jelmer at samba.org-20080629232350-bkqbc06pb9al6vxm
parent: jelmer at samba.org-20080702002510-vthyzwxslw3ayahw
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: svn-1.5
timestamp: Mon 2008-07-07 12:25:14 +0200
message:
  Merge 0.4.
modified:
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
  branch.py                      svnbranch.py-20051017135706-11c749eb0dab04a7
  client.c                       client.pyx-20080313235339-wbyjbw2namuiql8f-1
  commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
  convert.py                     svn2bzr.py-20051018015439-cb4563bff29e632d
  editor.c                       editor.c-20080602191336-frj7az1sdk13o1tw-1
  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-20070917005147-94kb7zysotf82kqw-1
  layout.py                      layout.py-20080323165407-y9qw8nx4oykvoe1k-1
  logwalker.py                   logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
  mapping3/__init__.py           __init__.py-20080502174630-9324zh25kka98vlw-1
  ra.c                           ra.pyx-20080313140933-qybkqaxe3m4mcll7-1
  remote.py                      format.py-20060406233823-b6fa009fe35dfde7
  repos.c                        repos.pyx-20080314114432-g2b5lqe776tkbl4k-1
  repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
  revids.py                      revids.py-20070416220458-36vfa0730cchevp1-1
  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_changes.py          test_changes.py-20080529111734-f7fbshmnlgnvue45-1
  tests/test_repository.py       test_repos.py-20060508151940-ddc49a59257ca712
  transport.py                   transport.py-20060406231150-b3472d06b3a0818d
  tree.py                        tree.py-20060624222557-dudlwqcmkf22lt2s-1
  util.h                         util.h-20080531154025-s8ef6ej9tytsnkkw-2
  versionedfiles.py              versionedfiles.py-20080626134117-j8g0ntz1pj228iox-1
  wc.c                           wc.pyx-20080313142018-10l8l23vha2j9e6b-1
  workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
    ------------------------------------------------------------
    revno: 1196.1.228
    revision-id: jelmer at samba.org-20080702002510-vthyzwxslw3ayahw
    parent: jelmer at samba.org-20080702002150-sgz37h2nfeiy2ihp
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Wed 2008-07-02 02:25:10 +0200
    message:
      Use connection management API when obtaining commit editor.
    modified:
      mapping3/__init__.py           __init__.py-20080502174630-9324zh25kka98vlw-1
    ------------------------------------------------------------
    revno: 1196.1.227
    revision-id: jelmer at samba.org-20080702002150-sgz37h2nfeiy2ihp
    parent: jelmer at samba.org-20080702001338-vlk63sx03ugontof
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Wed 2008-07-02 02:21:50 +0200
    message:
      Remove complex and somewhat pointless assertion.
    modified:
      transport.py                   transport.py-20060406231150-b3472d06b3a0818d
    ------------------------------------------------------------
    revno: 1196.1.226
    revision-id: jelmer at samba.org-20080702001338-vlk63sx03ugontof
    parent: jelmer at samba.org-20080701221549-rwwvwbs7zka6gebr
    parent: adrian.wilkins at gmail.com-20080701233639-crv8t352e5xme10n
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Wed 2008-07-02 02:13:38 +0200
    message:
      Merge fixes from Adrian that remove the dependency on C99.
    modified:
      client.c                       client.pyx-20080313235339-wbyjbw2namuiql8f-1
      editor.c                       editor.c-20080602191336-frj7az1sdk13o1tw-1
      ra.c                           ra.pyx-20080313140933-qybkqaxe3m4mcll7-1
      repos.c                        repos.pyx-20080314114432-g2b5lqe776tkbl4k-1
      wc.c                           wc.pyx-20080313142018-10l8l23vha2j9e6b-1
        ------------------------------------------------------------
        revno: 1196.14.1
        revision-id: adrian.wilkins at gmail.com-20080701233639-crv8t352e5xme10n
        parent: jelmer at samba.org-20080701211901-opljk7ozw2jhju7z
        committer: Adrian Wilkins <adrian.wilkins at gmail.com>
        branch nick: svn
        timestamp: Wed 2008-07-02 00:36:39 +0100
        message:
          Removed C99 struct initializers for compatibility with 'legacy' compilers (like MSVC 9.0)
        modified:
          client.c                       client.pyx-20080313235339-wbyjbw2namuiql8f-1
          editor.c                       editor.c-20080602191336-frj7az1sdk13o1tw-1
          ra.c                           ra.pyx-20080313140933-qybkqaxe3m4mcll7-1
          repos.c                        repos.pyx-20080314114432-g2b5lqe776tkbl4k-1
          wc.c                           wc.pyx-20080313142018-10l8l23vha2j9e6b-1
    ------------------------------------------------------------
    revno: 1196.1.225
    revision-id: jelmer at samba.org-20080701221549-rwwvwbs7zka6gebr
    parent: jelmer at samba.org-20080701213923-9jl2quanskc0oygn
    parent: roberto.aguilar at nutricate.com-20080701215234-zoba4jwuvtugewql
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Wed 2008-07-02 00:15:49 +0200
    message:
      Merge python2.4 fixes.
    modified:
      commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
      transport.py                   transport.py-20060406231150-b3472d06b3a0818d
        ------------------------------------------------------------
        revno: 1196.13.2
        revision-id: roberto.aguilar at nutricate.com-20080701215234-zoba4jwuvtugewql
        parent: roberto.aguilar at nutricate.com-20080701213936-4453l0x3k9rjnkg3
        committer: Roberto Aguilar <roberto.aguilar at nutricate.com>
        branch nick: svn
        timestamp: Tue 2008-07-01 14:52:34 -0700
        message:
          replacing the use of all() in transport.py so that it works in Python 2.4
        modified:
          transport.py                   transport.py-20060406231150-b3472d06b3a0818d
        ------------------------------------------------------------
        revno: 1196.13.1
        revision-id: roberto.aguilar at nutricate.com-20080701213936-4453l0x3k9rjnkg3
        parent: jelmer at samba.org-20080701211901-opljk7ozw2jhju7z
        committer: Roberto Aguilar <roberto.aguilar at nutricate.com>
        branch nick: svn
        timestamp: Tue 2008-07-01 14:39:36 -0700
        message:
          updating the way ids are passed to the SvnCommitBuilder class so that it is 
          compatible with Python 2.4
        modified:
          commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
    ------------------------------------------------------------
    revno: 1196.1.224
    revision-id: jelmer at samba.org-20080701213923-9jl2quanskc0oygn
    parent: jelmer at samba.org-20080701213719-85wrapyz8nesepj8
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-07-01 23:39:23 +0200
    message:
      Add docstring.
    modified:
      fileids.py                     fileids.py-20060714013623-u5iiyqqnko11grcf-1
    ------------------------------------------------------------
    revno: 1196.1.223
    revision-id: jelmer at samba.org-20080701213719-85wrapyz8nesepj8
    parent: jelmer at samba.org-20080701211901-opljk7ozw2jhju7z
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-07-01 23:37:19 +0200
    message:
      Avoid 2.5-ism.
    modified:
      commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
    ------------------------------------------------------------
    revno: 1196.1.222
    revision-id: jelmer at samba.org-20080701211901-opljk7ozw2jhju7z
    parent: jelmer at samba.org-20080701204236-1798iubpwn6it8r9
    parent: jelmer at samba.org-20080701211034-kldob0ont3ofzp1g
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-07-01 23:19:01 +0200
    message:
      More build fixes...
    modified:
      branch.py                      svnbranch.py-20051017135706-11c749eb0dab04a7
      remote.py                      format.py-20060406233823-b6fa009fe35dfde7
      revids.py                      revids.py-20070416220458-36vfa0730cchevp1-1
      tests/__init__.py              __init__.py-20060508151940-e9f4d914801a2535
      tests/test_branch.py           test_branch.py-20060508162215-74ffeb5d608f8e20
      util.h                         util.h-20080531154025-s8ef6ej9tytsnkkw-2
        ------------------------------------------------------------
        revno: 1196.12.2
        revision-id: jelmer at samba.org-20080701211034-kldob0ont3ofzp1g
        parent: jelmer at samba.org-20080701211009-0k0y2es919vf4v9w
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: 0.4
        timestamp: Tue 2008-07-01 23:10:34 +0200
        message:
          Fix query, branch paths.
        modified:
          branch.py                      svnbranch.py-20051017135706-11c749eb0dab04a7
          revids.py                      revids.py-20070416220458-36vfa0730cchevp1-1
        ------------------------------------------------------------
        revno: 1196.12.1
        revision-id: jelmer at samba.org-20080701211009-0k0y2es919vf4v9w
        parent: jelmer at samba.org-20080701204236-1798iubpwn6it8r9
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: 0.4
        timestamp: Tue 2008-07-01 23:10:09 +0200
        message:
          Fix tests.
        modified:
          tests/__init__.py              __init__.py-20060508151940-e9f4d914801a2535
          tests/test_branch.py           test_branch.py-20060508162215-74ffeb5d608f8e20
    ------------------------------------------------------------
    revno: 1196.1.221
    revision-id: jelmer at samba.org-20080701204236-1798iubpwn6it8r9
    parent: jelmer at samba.org-20080701201009-xjsipw5i34707d5p
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-07-01 22:42:36 +0200
    message:
      Add tests for find_prev_location.
    modified:
      tests/test_changes.py          test_changes.py-20080529111734-f7fbshmnlgnvue45-1
    ------------------------------------------------------------
    revno: 1196.1.220
    revision-id: jelmer at samba.org-20080701201009-xjsipw5i34707d5p
    parent: jelmer at samba.org-20080701193937-qy1byld932nn17ll
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-07-01 22:10:09 +0200
    message:
      Use sqlite functions for escaping variables.
    modified:
      revids.py                      revids.py-20070416220458-36vfa0730cchevp1-1
    ------------------------------------------------------------
    revno: 1196.1.219
    revision-id: jelmer at samba.org-20080701193937-qy1byld932nn17ll
    parent: jelmer at samba.org-20080701193627-gh9k751ju53djfm1
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-07-01 21:39:37 +0200
    message:
      Try harder to not check revisions more than once during fetch.
    modified:
      fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
    ------------------------------------------------------------
    revno: 1196.1.218
    revision-id: jelmer at samba.org-20080701193627-gh9k751ju53djfm1
    parent: jelmer at samba.org-20080701193443-c44nhhgwo3dr860k
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-07-01 21:36:27 +0200
    message:
      Add another progress bar.
    modified:
      repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
    ------------------------------------------------------------
    revno: 1196.1.217
    revision-id: jelmer at samba.org-20080701193443-c44nhhgwo3dr860k
    parent: jelmer at samba.org-20080701192624-kvh9q84tzh1nsk1l
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-07-01 21:34:43 +0200
    message:
      Add extra progress bar.
    modified:
      mapping3/__init__.py           __init__.py-20080502174630-9324zh25kka98vlw-1
    ------------------------------------------------------------
    revno: 1196.1.216
    revision-id: jelmer at samba.org-20080701192624-kvh9q84tzh1nsk1l
    parent: jelmer at samba.org-20080701191850-yy9zv090ewuc0yac
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-07-01 21:26:24 +0200
    message:
      Add progress bar to get_branches().
    modified:
      layout.py                      layout.py-20080323165407-y9qw8nx4oykvoe1k-1
      mapping3/__init__.py           __init__.py-20080502174630-9324zh25kka98vlw-1
    ------------------------------------------------------------
    revno: 1196.1.215
    revision-id: jelmer at samba.org-20080701191850-yy9zv090ewuc0yac
    parent: jelmer at samba.org-20080701191241-xcwdlm0n5psv2gas
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-07-01 21:18:50 +0200
    message:
      Add hash function for RevisionMeta.
    modified:
      repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
    ------------------------------------------------------------
    revno: 1196.1.214
    revision-id: jelmer at samba.org-20080701191241-xcwdlm0n5psv2gas
    parent: jelmer at samba.org-20080701181709-ic3dc2a5s5w6wi5t
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-07-01 21:12:41 +0200
    message:
      Improve guessing of branching scheme.
    modified:
      __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
    ------------------------------------------------------------
    revno: 1196.1.213
    revision-id: jelmer at samba.org-20080701181709-ic3dc2a5s5w6wi5t
    parent: jelmer at samba.org-20080701175018-zvlfcx5cr9ypfs40
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-07-01 20:17:09 +0200
    message:
      Use commit editor API.
    modified:
      tests/test_blackbox.py         test_blackbox.py-20070325150839-d10llf8arptpcfl6-1
    ------------------------------------------------------------
    revno: 1196.1.212
    revision-id: jelmer at samba.org-20080701175018-zvlfcx5cr9ypfs40
    parent: jelmer at samba.org-20080701173754-ej9pvn55wr7lxcye
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-07-01 19:50:18 +0200
    message:
      Stop leaking ra connections.
    modified:
      tree.py                        tree.py-20060624222557-dudlwqcmkf22lt2s-1
    ------------------------------------------------------------
    revno: 1196.1.211
    revision-id: jelmer at samba.org-20080701173754-ej9pvn55wr7lxcye
    parent: jelmer at samba.org-20080701173032-qtgp1q585cwqrmeo
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-07-01 19:37:54 +0200
    message:
      Cache http(s)/file ra connections.
    modified:
      transport.py                   transport.py-20060406231150-b3472d06b3a0818d
    ------------------------------------------------------------
    revno: 1196.1.210
    revision-id: jelmer at samba.org-20080701173032-qtgp1q585cwqrmeo
    parent: jelmer at samba.org-20080701171656-z9n3zi4gawkvbk52
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-07-01 19:30:32 +0200
    message:
      Update revprop cache when retrieving full revprops.
    modified:
      logwalker.py                   logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
    ------------------------------------------------------------
    revno: 1196.1.209
    revision-id: jelmer at samba.org-20080701171656-z9n3zi4gawkvbk52
    parent: jelmer at samba.org-20080701164344-usn2xenxz9jbwtnj
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-07-01 19:16:56 +0200
    message:
      Fix locking.
    modified:
      fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
    ------------------------------------------------------------
    revno: 1196.1.208
    revision-id: jelmer at samba.org-20080701164344-usn2xenxz9jbwtnj
    parent: jelmer at samba.org-20080701161237-p6x236jb1lyoubpx
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-07-01 18:43:44 +0200
    message:
      More improvements to progress bars.
    modified:
      convert.py                     svn2bzr.py-20051018015439-cb4563bff29e632d
      fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
      logwalker.py                   logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
    ------------------------------------------------------------
    revno: 1196.1.207
    revision-id: jelmer at samba.org-20080701161237-p6x236jb1lyoubpx
    parent: jelmer at samba.org-20080701160924-otjrs7zhqsrzyni5
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-07-01 18:12:37 +0200
    message:
      Avoid ra call for current revision branch path.
    modified:
      branch.py                      svnbranch.py-20051017135706-11c749eb0dab04a7
    ------------------------------------------------------------
    revno: 1196.1.206
    revision-id: jelmer at samba.org-20080701160924-otjrs7zhqsrzyni5
    parent: jelmer at samba.org-20080701155838-gdwt9x8klwgkjeww
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-07-01 18:09:24 +0200
    message:
      Avoid retrieving revision numbers for once for each branch during svn-import.
    modified:
      convert.py                     svn2bzr.py-20051018015439-cb4563bff29e632d
    ------------------------------------------------------------
    revno: 1196.1.205
    revision-id: jelmer at samba.org-20080701155838-gdwt9x8klwgkjeww
    parent: jelmer at samba.org-20080701155032-0ojd2bm5nr4enk5r
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-07-01 17:58:38 +0200
    message:
      Avoid reopening the repository each time when finding branches.
    modified:
      NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
      branch.py                      svnbranch.py-20051017135706-11c749eb0dab04a7
      remote.py                      format.py-20060406233823-b6fa009fe35dfde7
      repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
      workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
    ------------------------------------------------------------
    revno: 1196.1.204
    revision-id: jelmer at samba.org-20080701155032-0ojd2bm5nr4enk5r
    parent: jelmer at samba.org-20080701154910-uohb45umzt1k3ps7
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-07-01 17:50:32 +0200
    message:
      Avoid reopening transport, cache uuid and repos_root.
    modified:
      repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
      transport.py                   transport.py-20060406231150-b3472d06b3a0818d
    ------------------------------------------------------------
    revno: 1196.1.203
    revision-id: jelmer at samba.org-20080701154910-uohb45umzt1k3ps7
    parent: jelmer at samba.org-20080701134007-y8lp1k7v4yr796j3
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-07-01 17:49:10 +0200
    message:
      Remove unused import.
    modified:
      convert.py                     svn2bzr.py-20051018015439-cb4563bff29e632d
    ------------------------------------------------------------
    revno: 1196.1.202
    revision-id: jelmer at samba.org-20080701134007-y8lp1k7v4yr796j3
    parent: jelmer at samba.org-20080701130618-nmtug1uh0mzp5yp3
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-07-01 15:40:07 +0200
    message:
      remove mutters, add TODO.
    modified:
      versionedfiles.py              versionedfiles.py-20080626134117-j8g0ntz1pj228iox-1
    ------------------------------------------------------------
    revno: 1196.1.201
    revision-id: jelmer at samba.org-20080701130618-nmtug1uh0mzp5yp3
    parent: jelmer at samba.org-20080701130037-moq9z20astml644a
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-07-01 15:06:18 +0200
    message:
      Fix import.
    modified:
      versionedfiles.py              versionedfiles.py-20080626134117-j8g0ntz1pj228iox-1
    ------------------------------------------------------------
    revno: 1196.1.200
    revision-id: jelmer at samba.org-20080701130037-moq9z20astml644a
    parent: jelmer at samba.org-20080701124651-uh04jxaw3czphkgs
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-07-01 15:00:37 +0200
    message:
      Deal with directories.
    modified:
      errors.py                      errors.py-20061226172623-w1sbj8ynpo0eojqp-1
      versionedfiles.py              versionedfiles.py-20080626134117-j8g0ntz1pj228iox-1
    ------------------------------------------------------------
    revno: 1196.1.199
    revision-id: jelmer at samba.org-20080701124651-uh04jxaw3czphkgs
    parent: jelmer at samba.org-20080701123311-edxh24acz3fqq133
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-07-01 14:46:51 +0200
    message:
      Implement item_keys_introduced_by().
    modified:
      repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
      tests/test_repository.py       test_repos.py-20060508151940-ddc49a59257ca712
    ------------------------------------------------------------
    revno: 1196.1.198
    revision-id: jelmer at samba.org-20080701123311-edxh24acz3fqq133
    parent: jelmer at samba.org-20080630133804-bdhsrw0tslzzd9hp
    parent: jelmer at samba.org-20080701115424-817uklv2aq0d2fko
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-07-01 14:33:11 +0200
    message:
      Merge local change.
    modified:
      __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
      repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
        ------------------------------------------------------------
        revno: 1196.11.1
        revision-id: jelmer at samba.org-20080701115424-817uklv2aq0d2fko
        parent: jelmer at samba.org-20080630133804-bdhsrw0tslzzd9hp
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: 0.4
        timestamp: Tue 2008-07-01 13:54:24 +0200
        message:
          Avoid reopening bzrdir.
        modified:
          __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
    ------------------------------------------------------------
    revno: 1196.1.197
    revision-id: jelmer at samba.org-20080630133804-bdhsrw0tslzzd9hp
    parent: jelmer at samba.org-20080630132657-rsyfgf984lftwgha
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2008-06-30 15:38:04 +0200
    message:
      Fix relative imports, skip version check for 'exp' versions.
    modified:
      __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
      format.py                      format.py-20070917005147-94kb7zysotf82kqw-1
    ------------------------------------------------------------
    revno: 1196.1.196
    revision-id: jelmer at samba.org-20080630132657-rsyfgf984lftwgha
    parent: jelmer at samba.org-20080630121113-jhdvbs2e1t4ax8kk
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2008-06-30 15:26:57 +0200
    message:
      Make sure log caches are stored.
    modified:
      logwalker.py                   logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
    ------------------------------------------------------------
    revno: 1196.1.195
    revision-id: jelmer at samba.org-20080630121113-jhdvbs2e1t4ax8kk
    parent: jelmer at samba.org-20080629232116-aashoa0pnmb5my9o
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2008-06-30 14:11:13 +0200
    message:
      Avoid relative imports.
    modified:
      __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
      remote.py                      format.py-20060406233823-b6fa009fe35dfde7

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



More information about the bazaar-commits mailing list