Rev 414: merge upstream. in file:///home/jelmer/bzr-svn/native/

Jelmer Vernooij jelmer at samba.org
Thu Feb 1 14:08:34 GMT 2007


At file:///home/jelmer/bzr-svn/native/

------------------------------------------------------------
revno: 414
revision-id: jelmer at samba.org-20070201140831-thrim5k5gdbwddii
parent: jelmer at samba.org-20070122183621-rsper7qlcw3v9i1k
parent: jelmer at samba.org-20070201103709-z4xm1j5cwaezzxt0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: native
timestamp: Thu 2007-02-01 15:08:31 +0100
message:
  merge upstream.
removed:
  testdata/                      testdata-20051220215114-b6c9de5a0530b918
  testdata/branchtagcopy.dump    branchtagcopy.dump-20060620002331-6s8d3avibaa0g294-1
  testdata/changeaftercp.dump    changeaftercp.dump-20060327131819-c842a0dd819e13b7
  testdata/combinedbranch.dump   combinedbranch.dump-20060312193533-a5e4f3d0dca329b9
  testdata/executable.dump       executable.dump-20051220215114-830863381d22535c
  testdata/ignore.dump           ignore.dump-20051220215114-fce6fb0175282e91
  testdata/inheritance.dump      inheritance.dump-20060512015842-984b585a8fb184d7
  testdata/movebranch.dump       movebranch.dump-20051220215114-070b064dc138ef40
  testdata/movefileorder.dump    movefileorder.dump-20060326163530-95355b5c37981874
  testdata/recreatebranch.dump   recreatebranch.dump-20051220215114-ea70eab1cd80177a
  tests/TODO                     TODO-20060625225740-p9k905958uae94q5-1
added:
  tests/test_errors.py           test_errors.py-20070129114605-ban03f32t6ja14ez-1
modified:
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  README                         README-20051120210643-bd274a2fef9aed6a
  TODO                           todo-20060729211917-2kpobww0zyvvo0j2-1
  __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
  branch.py                      svnbranch.py-20051017135706-11c749eb0dab04a7
  convert.py                     svn2bzr.py-20051018015439-cb4563bff29e632d
  errors.py                      errors.py-20061226172623-w1sbj8ynpo0eojqp-1
  logwalker.py                   logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
  tests/__init__.py              __init__.py-20060508151940-e9f4d914801a2535
  tests/test_workingtree.py      test_workingtree.py-20060622191524-0di7bc3q1ckdbybb-1
  transport.py                   transport.py-20060406231150-b3472d06b3a0818d
  upgrade.py                     upgrade.py-20070106192108-0rakplee2lzah4gs-1
    ------------------------------------------------------------
    revno: 412.1.9
    merged: jelmer at samba.org-20070201103709-z4xm1j5cwaezzxt0
    parent: jelmer at samba.org-20070131131854-vp5bqzuy9zc3kizz
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Thu 2007-02-01 11:37:09 +0100
    message:
      get rid of svn.ra.ls in favor of checkout. this should improve the amount of time required to determine the file id map of an indepedent revision tree significantly.
    ------------------------------------------------------------
    revno: 412.1.8
    merged: jelmer at samba.org-20070131131854-vp5bqzuy9zc3kizz
    parent: jelmer at samba.org-20070131125440-9iuoz9y1oo3omtxv
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Wed 2007-01-31 14:18:54 +0100
    message:
      Remove outdated files. The testsuite was already up to date
    ------------------------------------------------------------
    revno: 412.1.7
    merged: jelmer at samba.org-20070131125440-9iuoz9y1oo3omtxv
    parent: jelmer at samba.org-20070131120255-aty0vln7gmh7wfgh
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Wed 2007-01-31 13:54:40 +0100
    message:
      Make sure returns work when using the error decorator, add simple test for nick names in working trees.
    ------------------------------------------------------------
    revno: 412.1.6
    merged: jelmer at samba.org-20070131120255-aty0vln7gmh7wfgh
    parent: jelmer at samba.org-20070129185019-guwbgzyaxo10ackl
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Wed 2007-01-31 13:02:55 +0100
    message:
      Use the error-convert decorator. TCP connections being dropped will now no longer result in long backtraces but rather give a sane error.
    ------------------------------------------------------------
    revno: 412.1.5
    merged: jelmer at samba.org-20070129185019-guwbgzyaxo10ackl
    parent: jelmer at samba.org-20070129172100-rs072ggnyssuteyj
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Mon 2007-01-29 19:50:19 +0100
    message:
      Remove hash-bang lines
    ------------------------------------------------------------
    revno: 412.1.4
    merged: jelmer at samba.org-20070129172100-rs072ggnyssuteyj
    parent: jelmer at samba.org-20070129151934-jx7h3df8ywl678md
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Mon 2007-01-29 18:21:00 +0100
    message:
      Fix errors testcases.
    ------------------------------------------------------------
    revno: 412.1.3
    merged: jelmer at samba.org-20070129151934-jx7h3df8ywl678md
    parent: jelmer at samba.org-20070124141927-dksr08au224gomps
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Mon 2007-01-29 16:19:34 +0100
    message:
      Add tests for error code.
    ------------------------------------------------------------
    revno: 412.1.2
    merged: jelmer at samba.org-20070124141927-dksr08au224gomps
    parent: jelmer at samba.org-20070124125639-8h9p6y3peumfb9p3
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Wed 2007-01-24 15:19:27 +0100
    message:
      Warn about versions of sqlite that are too old.
    ------------------------------------------------------------
    revno: 412.1.1
    merged: jelmer at samba.org-20070124125639-8h9p6y3peumfb9p3
    parent: jelmer at samba.org-20070122105054-po2g4eoaytunwege
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Wed 2007-01-24 13:56:39 +0100
    message:
      Fix import, thanks metze

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



More information about the bazaar-commits mailing list