Rev 1235: Merge upstream. in file:///data/jelmer/bzr-svn/0.4-wc/

Jelmer Vernooij jelmer at samba.org
Thu Jun 19 15:08:11 BST 2008


At file:///data/jelmer/bzr-svn/0.4-wc/

------------------------------------------------------------
revno: 1235
revision-id: jelmer at samba.org-20080619140810-f4ndo3wirlc2w7u2
parent: jelmer at samba.org-20080617201754-q2q3jak510dod9ac
parent: jelmer at samba.org-20080619140637-nxobzdjoac3l6rkx
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4-wc
timestamp: Thu 2008-06-19 16:08:10 +0200
message:
  Merge upstream.
added:
  delta.py                       delta.py-20080617225125-jeg43afui0czkuwk-1
modified:
  Makefile                       makefile.other-20080311181537-5svhje3v1flh1n4f-1
  __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
  auth.py                        auth.py-20071209174622-w8d42k6nm5yhxvi8-1
  commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
  convert.py                     svn2bzr.py-20051018015439-cb4563bff29e632d
  fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
  format.py                      format.py-20070917005147-94kb7zysotf82kqw-1
  logwalker.py                   logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
  mapping3/__init__.py           __init__.py-20080502174630-9324zh25kka98vlw-1
  ra.py                          ra.py-20080615005305-t5221niknu8rm6bt-1
  revspec.py                     revspec.py-20071106211507-q4fz2en91yrmjjl8-1
  tests/__init__.py              __init__.py-20060508151940-e9f4d914801a2535
  tests/test_branch.py           test_branch.py-20060508162215-74ffeb5d608f8e20
  tests/test_checkout.py         test_checkout.py-20070101154110-eevkc29qj0q7udz5-1
  tests/test_fetch.py            test_fetch.py-20070624210302-luvgwjmlfysk5qeq-1
  tests/test_workingtree.py      test_workingtree.py-20060622191524-0di7bc3q1ckdbybb-1
  transport.py                   transport.py-20060406231150-b3472d06b3a0818d
  tree.py                        tree.py-20060624222557-dudlwqcmkf22lt2s-1
  workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
    ------------------------------------------------------------
    revno: 1233.1.10
    revision-id: jelmer at samba.org-20080619140637-nxobzdjoac3l6rkx
    parent: jelmer at samba.org-20080619135842-8kg5be1na8cgdptp
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Thu 2008-06-19 16:06:37 +0200
    message:
      Use property rather than function for busy data.
    modified:
      fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
      ra.py                          ra.py-20080615005305-t5221niknu8rm6bt-1
      transport.py                   transport.py-20060406231150-b3472d06b3a0818d
    ------------------------------------------------------------
    revno: 1233.1.9
    revision-id: jelmer at samba.org-20080619135842-8kg5be1na8cgdptp
    parent: jelmer at samba.org-20080618115824-vzo020t2d83ik66x
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Thu 2008-06-19 15:58:42 +0200
    message:
      Make editor API more object oriented.
    modified:
      __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
      auth.py                        auth.py-20071209174622-w8d42k6nm5yhxvi8-1
      convert.py                     svn2bzr.py-20051018015439-cb4563bff29e632d
      delta.py                       delta.py-20080617225125-jeg43afui0czkuwk-1
      fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
      logwalker.py                   logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
      ra.py                          ra.py-20080615005305-t5221niknu8rm6bt-1
      revspec.py                     revspec.py-20071106211507-q4fz2en91yrmjjl8-1
      tree.py                        tree.py-20060624222557-dudlwqcmkf22lt2s-1
    ------------------------------------------------------------
    revno: 1233.1.8
    revision-id: jelmer at samba.org-20080618115824-vzo020t2d83ik66x
    parent: jelmer at samba.org-20080617225233-2b79ggobt2sc0qet
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Wed 2008-06-18 13:58:24 +0200
    message:
      Change API to be more similar to cext branch.
    modified:
      auth.py                        auth.py-20071209174622-w8d42k6nm5yhxvi8-1
      commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
      fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
      ra.py                          ra.py-20080615005305-t5221niknu8rm6bt-1
      tree.py                        tree.py-20060624222557-dudlwqcmkf22lt2s-1
      workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
    ------------------------------------------------------------
    revno: 1233.1.7
    revision-id: jelmer at samba.org-20080617225233-2b79ggobt2sc0qet
    parent: jelmer at samba.org-20080617223119-ub4cxwjhnya05p5n
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Wed 2008-06-18 00:52:33 +0200
    message:
      Move delta operations to separate file.
    added:
      delta.py                       delta.py-20080617225125-jeg43afui0czkuwk-1
    modified:
      fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
      format.py                      format.py-20070917005147-94kb7zysotf82kqw-1
      mapping3/__init__.py           __init__.py-20080502174630-9324zh25kka98vlw-1
      ra.py                          ra.py-20080615005305-t5221niknu8rm6bt-1
      tests/test_branch.py           test_branch.py-20060508162215-74ffeb5d608f8e20
      tests/test_checkout.py         test_checkout.py-20070101154110-eevkc29qj0q7udz5-1
      tree.py                        tree.py-20060624222557-dudlwqcmkf22lt2s-1
      workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
    ------------------------------------------------------------
    revno: 1233.1.6
    revision-id: jelmer at samba.org-20080617223119-ub4cxwjhnya05p5n
    parent: jelmer at samba.org-20080617222600-mwb5selnhivyzmtu
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Wed 2008-06-18 00:31:19 +0200
    message:
      Cherrypick some changes from the cext branch.
    modified:
      format.py                      format.py-20070917005147-94kb7zysotf82kqw-1
      tests/test_workingtree.py      test_workingtree.py-20060622191524-0di7bc3q1ckdbybb-1
      tree.py                        tree.py-20060624222557-dudlwqcmkf22lt2s-1
      workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
    ------------------------------------------------------------
    revno: 1233.1.5
    revision-id: jelmer at samba.org-20080617222600-mwb5selnhivyzmtu
    parent: jelmer at samba.org-20080617222130-x7hg1cok27gp6qme
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Wed 2008-06-18 00:26:00 +0200
    message:
      Rename baton to editor, which is more appropriate for the OO interface.
    modified:
      commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
    ------------------------------------------------------------
    revno: 1233.1.4
    revision-id: jelmer at samba.org-20080617222130-x7hg1cok27gp6qme
    parent: jelmer at samba.org-20080617210310-x1uzjw4hry0x252d
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Wed 2008-06-18 00:21:30 +0200
    message:
      More object oriented editor interface.
    modified:
      commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
      mapping3/__init__.py           __init__.py-20080502174630-9324zh25kka98vlw-1
      ra.py                          ra.py-20080615005305-t5221niknu8rm6bt-1
      tests/__init__.py              __init__.py-20060508151940-e9f4d914801a2535
      tests/test_fetch.py            test_fetch.py-20070624210302-luvgwjmlfysk5qeq-1
    ------------------------------------------------------------
    revno: 1233.1.3
    revision-id: jelmer at samba.org-20080617210310-x1uzjw4hry0x252d
    parent: jelmer at samba.org-20080617205523-hqus05shap15g9yc
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-06-17 23:03:10 +0200
    message:
      Specify paths explicitly to do_update and do_switch.
    modified:
      fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
      logwalker.py                   logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
      ra.py                          ra.py-20080615005305-t5221niknu8rm6bt-1
      transport.py                   transport.py-20060406231150-b3472d06b3a0818d
      tree.py                        tree.py-20060624222557-dudlwqcmkf22lt2s-1
    ------------------------------------------------------------
    revno: 1233.1.2
    revision-id: jelmer at samba.org-20080617205523-hqus05shap15g9yc
    parent: jelmer at samba.org-20080617202354-kjwsfvx2j486yrep
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-06-17 22:55:23 +0200
    message:
      Remove memory Pool usage in bzr-svn.
    modified:
      commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
      fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
      logwalker.py                   logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
      ra.py                          ra.py-20080615005305-t5221niknu8rm6bt-1
      transport.py                   transport.py-20060406231150-b3472d06b3a0818d
      tree.py                        tree.py-20060624222557-dudlwqcmkf22lt2s-1
      workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
    ------------------------------------------------------------
    revno: 1233.1.1
    revision-id: jelmer at samba.org-20080617202354-kjwsfvx2j486yrep
    parent: jelmer at samba.org-20080617195350-opqh4swky27h0ky7
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-06-17 22:23:54 +0200
    message:
      Add some extra targets to makefile to ease debugging.
    modified:
      Makefile                       makefile.other-20080311181537-5svhje3v1flh1n4f-1

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



More information about the bazaar-commits mailing list