[Pkg-bazaar-commits] r266 ./bzr-svn/unstable: Merge 0.4.0

Jelmer Vernooij jelmer at samba.org
Sat Aug 4 19:26:45 UTC 2007


------------------------------------------------------------
revno: 266
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: debian
timestamp: Sat 2007-08-04 21:25:46 +0200
message:
  Merge 0.4.0
removed:
  testdata/
  testdata/branchtagcopy.dump
  testdata/changeaftercp.dump
  testdata/combinedbranch.dump
  testdata/executable.dump
  testdata/ignore.dump
  testdata/inheritance.dump
  testdata/movebranch.dump
  testdata/movefileorder.dump
  testdata/recreatebranch.dump
  tests/TODO
added:
  config.py
  revids.py
  tests/test_config.py
  tests/test_errors.py
  tests/test_fetch.py
  tests/test_push.py
  tests/test_revids.py
renamed:
  checkout.py => workingtree.py
modified:
  .bzrignore
  AUTHORS
  NEWS
  README
  TODO
  __init__.py
  branch.py
  branchprops.py
  cache.py
  commit.py
  convert.py
  debian/changelog
  debian/control
  errors.py
  fetch.py
  fileids.py
  format.py
  logwalker.py
  mapping.txt
  repository.py
  scheme.py
  setup.py
  tests/__init__.py
  tests/test_blackbox.py
  tests/test_branch.py
  tests/test_branchprops.py
  tests/test_checkout.py
  tests/test_commit.py
  tests/test_convert.py
  tests/test_fileids.py
  tests/test_logwalker.py
  tests/test_radir.py
  tests/test_repos.py
  tests/test_scheme.py
  tests/test_transport.py
  tests/test_tree.py
  tests/test_upgrade.py
  tests/test_workingtree.py
  transport.py
  tree.py
  upgrade.py
  workingtree.py
    ------------------------------------------------------------
    revno: 220.1.169.1.1
    merged: jelmer at samba.org-20070109030033-nv7e48u1jnuo7afi
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: ver3
    timestamp: Tue 2007-01-09 04:00:33 +0100
    message:
      Add specification for version 3
    ------------------------------------------------------------
    revno: 220.1.169.1.2
    merged: jelmer at samba.org-20070110015533-0gsoakvowzntfbrl
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: ver3
    timestamp: Wed 2007-01-10 02:55:33 +0100
    message:
      Follow new revision id format
    ------------------------------------------------------------
    revno: 220.1.169.1.3
    merged: jelmer at samba.org-20070110015644-854iy6manxjo9zu0
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: ver3
    timestamp: Wed 2007-01-10 02:56:44 +0100
    message:
      Merge upstream
    ------------------------------------------------------------
    revno: 220.1.169.1.4
    merged: jelmer at samba.org-20070110035917-9w6ag249rblmg0oc
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: ver3
    timestamp: Wed 2007-01-10 04:59:17 +0100
    message:
      Fix tests for new revision ids
    ------------------------------------------------------------
    revno: 220.1.169.1.5
    merged: jelmer at samba.org-20070114015613-yfjhkjcvl3fbt8b4
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: ver3
    timestamp: Sun 2007-01-14 02:56:13 +0100
    message:
      Fix some of the file id tests
    ------------------------------------------------------------
    revno: 220.1.169.1.6
    merged: jelmer at samba.org-20070114030508-miy4yc1daskumby1
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: ver3
    timestamp: Sun 2007-01-14 04:05:08 +0100
    message:
      merge from upstream
    ------------------------------------------------------------
    revno: 220.1.169.1.7
    merged: jelmer at samba.org-20070114055700-9ybu0e0sf0t2bsp9
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: ver3
    timestamp: Sun 2007-01-14 06:57:00 +0100
    message:
      Fix remaining tests.
    ------------------------------------------------------------
    revno: 220.1.169.1.8
    merged: jelmer at samba.org-20070115172815-93j1sk2ylwzh8tt9
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: ver3
    timestamp: Mon 2007-01-15 18:28:15 +0100
    message:
      Merge from upstream.
    ------------------------------------------------------------
    revno: 220.1.182.1.1
    merged: jelmer at samba.org-20070116101442-8ipstsewthjbimhp
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Tue 2007-01-16 11:14:42 +0100
    message:
      Import version 3 changes.
    ------------------------------------------------------------
    revno: 220.1.182.1.2
    merged: jelmer at samba.org-20070117140701-iu1fbunp0q8vb7i0
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Wed 2007-01-17 15:07:01 +0100
    message:
      Update for bzr.dev
    ------------------------------------------------------------
    revno: 220.1.182.1.3
    merged: jelmer at samba.org-20070118131914-sspamg4fv9c9mpv5
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Thu 2007-01-18 14:19:14 +0100
    message:
      Distinguish between branches and tags
    ------------------------------------------------------------
    revno: 220.1.182.1.4
    merged: jelmer at samba.org-20070118193803-s4zr8hb59dupq9u4
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Thu 2007-01-18 20:38:03 +0100
    message:
      Merge fix from Wouter.
        ------------------------------------------------------------
        revno: 220.1.182.1.2.1.1
        merged: larstiq at larstiq.dyndns.org-20070118164643-rrnsu7a3c1or16s8
        committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
        branch nick: bzr-svn
        timestamp: Thu 2007-01-18 17:46:43 +0100
        message:
          Use fully qualified name for BzrError
    ------------------------------------------------------------
    revno: 220.1.182.1.5
    merged: jelmer at samba.org-20070120160208-rnrt8vo3m396330p
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Sat 2007-01-20 17:02:08 +0100
    message:
      Add check for pysqlite (fixes #80473).
    ------------------------------------------------------------
    revno: 220.1.182.1.6
    merged: jelmer at samba.org-20070120181401-r8zj3xtwyezlnfnl
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Sat 2007-01-20 19:14:01 +0100
    message:
      Update NEWS
    ------------------------------------------------------------
    revno: 220.1.182.1.7
    merged: jelmer at samba.org-20070120224027-8bmtpksroz7awkla
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Sat 2007-01-20 23:40:27 +0100
    message:
      Move error conversion function to errors.py.
    ------------------------------------------------------------
    revno: 220.1.182.1.8
    merged: jelmer at samba.org-20070120230110-3qrbo5iqx7z56sdl
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Sun 2007-01-21 00:01:10 +0100
    message:
      Implement get_revision_graph(None).
    ------------------------------------------------------------
    revno: 220.1.182.1.9
    merged: jelmer at samba.org-20070120231109-vq4a8bef2c9fscyu
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Sun 2007-01-21 00:11:09 +0100
    message:
      Disable working tree support when using an old version of python-subversion
    ------------------------------------------------------------
    revno: 220.1.182.1.10
    merged: jelmer at samba.org-20070122105054-po2g4eoaytunwege
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Mon 2007-01-22 11:50:54 +0100
    message:
      Run tests in __init__, for use with coverage.py
    ------------------------------------------------------------
    revno: 220.1.182.1.11
    merged: jelmer at samba.org-20070124125639-8h9p6y3peumfb9p3
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Wed 2007-01-24 13:56:39 +0100
    message:
      Fix import, thanks metze
    ------------------------------------------------------------
    revno: 220.1.182.1.12
    merged: jelmer at samba.org-20070124141927-dksr08au224gomps
    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: 220.1.182.1.13
    merged: jelmer at samba.org-20070129151934-jx7h3df8ywl678md
    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: 220.1.182.1.14
    merged: jelmer at samba.org-20070129172100-rs072ggnyssuteyj
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Mon 2007-01-29 18:21:00 +0100
    message:
      Fix errors testcases.
    ------------------------------------------------------------
    revno: 220.1.182.1.15
    merged: jelmer at samba.org-20070129185019-guwbgzyaxo10ackl
    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: 220.1.182.1.16
    merged: jelmer at samba.org-20070131120255-aty0vln7gmh7wfgh
    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: 220.1.182.1.17
    merged: jelmer at samba.org-20070131125440-9iuoz9y1oo3omtxv
    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: 220.1.182.1.18
    merged: jelmer at samba.org-20070131131854-vp5bqzuy9zc3kizz
    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: 220.1.182.1.19
    merged: jelmer at samba.org-20070201103709-z4xm1j5cwaezzxt0
    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: 220.1.182.1.20
    merged: jelmer at samba.org-20070202113947-vbxhka9gzhvff6lg
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Fri 2007-02-02 12:39:47 +0100
    message:
      Don't spin if target directory does not exist. (#80223)
    ------------------------------------------------------------
    revno: 220.1.182.1.21
    merged: jelmer at samba.org-20070202141332-yt8jneutdi68j697
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Fri 2007-02-02 15:13:32 +0100
    message:
      remove directories if they are unrelated when importing (#81908)
    ------------------------------------------------------------
    revno: 220.1.182.1.22
    merged: jelmer at samba.org-20070202194810-u6ce2rs57hzaykt4
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Fri 2007-02-02 20:48:10 +0100
    message:
      Wrap reporter API in a bit more pythonic way, also making it easier to replace later by another implementation.
    ------------------------------------------------------------
    revno: 220.1.182.1.23
    merged: jelmer at samba.org-20070210135306-h57124ufb6re4ekz
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Sat 2007-02-10 14:53:06 +0100
    message:
      Remove unnecessary initialization, add assertions.
        ------------------------------------------------------------
        revno: 220.1.182.1.22.1.1
        merged: jelmer at samba.org-20070207224558-4c461v1nvsd293r5
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: main
        timestamp: Wed 2007-02-07 23:45:58 +0100
        message:
          Remove unnecessary initialization.
    ------------------------------------------------------------
    revno: 220.1.182.1.24
    merged: jelmer at samba.org-20070224144818-9q8310l11hjnmt8u
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Sat 2007-02-24 15:48:18 +0100
    message:
      Fix use with current bzr.dev.
    ------------------------------------------------------------
    revno: 220.1.182.1.25
    merged: jelmer at samba.org-20070303204214-1rqqgdk2nc82vvfu
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Sat 2007-03-03 21:42:14 +0100
    message:
      Handle unicode revids.
    ------------------------------------------------------------
    revno: 220.1.182.1.26
    merged: jelmer at samba.org-20070304010912-c2lku185on728s02
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Sun 2007-03-04 02:09:12 +0100
    message:
      Fix all but one tests for 0.15.
    ------------------------------------------------------------
    revno: 220.1.182.1.27
    merged: jelmer at samba.org-20070304011548-vmqlcoqes9gmd0pi
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Sun 2007-03-04 02:15:48 +0100
    message:
      Merge fixes from 0.3 branch.
    ------------------------------------------------------------
    revno: 220.1.182.1.28
    merged: jelmer at samba.org-20070304125003-20rzetkgu0l40mxc
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Sun 2007-03-04 13:50:03 +0100
    message:
      Merge 0.15 fixes.
    ------------------------------------------------------------
    revno: 220.1.182.1.29
    merged: jelmer at samba.org-20070308184856-mf3b7dh75r0d1dbg
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Thu 2007-03-08 19:48:56 +0100
    message:
      Prepare for 0.16
    ------------------------------------------------------------
    revno: 220.1.182.1.30
    merged: jelmer at samba.org-20070313002403-57ghh1n3sqrurjtr
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Tue 2007-03-13 01:24:03 +0100
    message:
      Merge from 0.3 branch
    ------------------------------------------------------------
    revno: 220.1.182.1.31
    merged: jelmer at samba.org-20070313143505-59evkrfikl4aoa56
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Tue 2007-03-13 15:35:05 +0100
    message:
      Merge 0.3.2
    ------------------------------------------------------------
    revno: 220.1.182.1.32
    merged: jelmer at samba.org-20070315163013-v1yhb9vkikfuhmtj
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Thu 2007-03-15 17:30:13 +0100
    message:
      Merge speed improvements from 0.3 branch.
    ------------------------------------------------------------
    revno: 220.1.182.1.33
    merged: jelmer at samba.org-20070315191021-cdt3v2b4hawocemy
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Thu 2007-03-15 20:10:21 +0100
    message:
      Fix tests.
    ------------------------------------------------------------
    revno: 220.1.182.1.34
    merged: jelmer at samba.org-20070316223029-bmf3g7bbh3xgzgrm
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Fri 2007-03-16 23:30:29 +0100
    message:
      Merge support for unique root ids.
        ------------------------------------------------------------
        revno: 220.1.16.1.1
        merged: jelmer at samba.org-20061212113418-qh4arbd0rabgle3l
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: norootid
        timestamp: Tue 2006-12-12 12:34:18 +0100
        message:
          Remove ROOT_ID.
        ------------------------------------------------------------
        revno: 220.1.16.1.2
        merged: jelmer at samba.org-20061212122729-4c4wxjh01ompdwh5
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: norootid
        timestamp: Tue 2006-12-12 13:27:29 +0100
        message:
          Fix first couple of tests.
        ------------------------------------------------------------
        revno: 220.1.16.1.3
        merged: jelmer at samba.org-20061212200008-r08qsbc6wneliyy7
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: norootid
        timestamp: Tue 2006-12-12 21:00:08 +0100
        message:
          Fix some more tests.
        ------------------------------------------------------------
        revno: 220.1.16.1.4
        merged: jelmer at samba.org-20061212200018-qqbnzdre65bzp4lc
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: norootid
        timestamp: Tue 2006-12-12 21:00:18 +0100
        message:
          Merge main branch.
        ------------------------------------------------------------
        revno: 220.1.16.1.5
        merged: jelmer at samba.org-20061212221824-o990uu7bunvdabxs
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: norootid
        timestamp: Tue 2006-12-12 23:18:24 +0100
        message:
          More work on supporting variable ROOT_ID's
        ------------------------------------------------------------
        revno: 220.1.16.1.6
        merged: jelmer at samba.org-20061212222806-ho5n55gwssa7w0t8
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: norootid
        timestamp: Tue 2006-12-12 23:28:06 +0100
        message:
          Fix fileid test.
        ------------------------------------------------------------
        revno: 220.1.16.1.7
        merged: jelmer at samba.org-20061215203127-on3a7hvoq3x0anid
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: norootid
        timestamp: Fri 2006-12-15 21:31:27 +0100
        message:
          Merge from trunk.
        ------------------------------------------------------------
        revno: 220.1.16.1.8
        merged: jelmer at samba.org-20061215205711-drmzbf2t5wtd19ka
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: norootid
        timestamp: Fri 2006-12-15 21:57:11 +0100
        message:
          Require bzr 0.14 - 0.13 doesn't contain add_path() fixes.
        ------------------------------------------------------------
        revno: 220.1.16.1.9
        merged: jelmer at samba.org-20061220111612-08ry01xlmpv7fsq8
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: norootid
        timestamp: Wed 2006-12-20 12:16:12 +0100
        message:
          Merge trunk changes.
        ------------------------------------------------------------
        revno: 220.1.16.1.10
        merged: jelmer at samba.org-20061220114423-whtiohd8b95ysmxm
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: norootid
        timestamp: Wed 2006-12-20 12:44:23 +0100
        message:
          Merge fix.
        ------------------------------------------------------------
        revno: 220.1.16.1.11
        merged: jelmer at samba.org-20061220135248-hbq6yve4a830mj3b
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: norootid
        timestamp: Wed 2006-12-20 14:52:48 +0100
        message:
          merge fix
        ------------------------------------------------------------
        revno: 220.1.16.1.12
        merged: jelmer at samba.org-20061220141914-6au3ze3wf5ff3d76
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: norootid
        timestamp: Wed 2006-12-20 15:19:14 +0100
        message:
          Make root ids less special (use "regular" file ids, so 
          by-value nested branches are possible).
        ------------------------------------------------------------
        revno: 220.1.16.1.13
        merged: jelmer at samba.org-20061220215935-4iw53e2cixuh27fn
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: norootid
        timestamp: Wed 2006-12-20 22:59:35 +0100
        message:
          Make testsuite pass with unique root ids.
        ------------------------------------------------------------
        revno: 220.1.16.1.14
        merged: jelmer at samba.org-20061220220131-ygbzo09knuxminx0
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: norootid
        timestamp: Wed 2006-12-20 23:01:31 +0100
        message:
          Merge sqlite fixes from main branch.
        ------------------------------------------------------------
        revno: 220.1.16.1.15
        merged: jelmer at samba.org-20061221202922-dj76rpah7xwzcvj0
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: norootid
        timestamp: Thu 2006-12-21 21:29:22 +0100
        message:
          Add notes about file id mappings.
        ------------------------------------------------------------
        revno: 220.1.16.1.16
        merged: jelmer at samba.org-20061222003357-8rhdh7lqtuxw9pwk
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: norootid
        timestamp: Fri 2006-12-22 01:33:57 +0100
        message:
          Start storing file id mappings.
        ------------------------------------------------------------
        revno: 220.1.16.1.17
        merged: jelmer at samba.org-20061222040558-ymmx5xvakirdwpev
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: norootid
        timestamp: Fri 2006-12-22 05:05:58 +0100
        message:
          Fix tests that check storing file id maps. Passes now with Aarons' 
          by-reference-nested-tree branch.
        ------------------------------------------------------------
        revno: 220.1.16.1.18
        merged: jelmer at samba.org-20061223165335-v7pu91kwhgpnyxfr
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: norootid
        timestamp: Sat 2006-12-23 17:53:35 +0100
        message:
          Ignore tags files.
        ------------------------------------------------------------
        revno: 220.1.16.1.19
        merged: jelmer at samba.org-20061223165812-gauwlfwq5bg3yxu0
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: norootid
        timestamp: Sat 2006-12-23 17:58:12 +0100
        message:
          Add support for id maps to the file id generating functions.
        ------------------------------------------------------------
        revno: 220.1.16.1.20
        merged: jelmer at samba.org-20061223184826-gaalaufxq56vd32t
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: norootid
        timestamp: Sat 2006-12-23 19:48:26 +0100
        message:
          Add revision_fileid_renames() function for looking up file id rename maps.
        ------------------------------------------------------------
        revno: 220.1.16.1.21
        merged: jelmer at samba.org-20061223200829-bolzx88r5nugf8rd
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: norootid
        timestamp: Sat 2006-12-23 21:08:29 +0100
        message:
          Merge upstream fixes.
        ------------------------------------------------------------
        revno: 220.1.16.1.22
        merged: jelmer at samba.org-20061224003509-g7nn4aslhzz52fni
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: norootid
        timestamp: Sun 2006-12-24 01:35:09 +0100
        message:
          Merge upstream fixes.
        ------------------------------------------------------------
        revno: 220.1.16.1.23
        merged: jelmer at samba.org-20061224004805-beb39pbo1gts79c6
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: norootid
        timestamp: Sun 2006-12-24 01:48:05 +0100
        message:
          Support file id renames. This fixes all tests but one.
        ------------------------------------------------------------
        revno: 220.1.16.1.24
        merged: jelmer at samba.org-20061224005734-9vht3uphksifcyi8
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: norootid
        timestamp: Sun 2006-12-24 01:57:34 +0100
        message:
          Add tests demonstrating problems with demoting/promoting branches in Subversion (#67010).
        ------------------------------------------------------------
        revno: 220.1.16.1.25
        merged: jelmer at samba.org-20061228021810-6k8pvr2djgzj1xmy
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: norootid
        timestamp: Thu 2006-12-28 03:18:10 +0100
        message:
          Remove verbose mutter.
        ------------------------------------------------------------
        revno: 220.1.16.1.26
        merged: jelmer at samba.org-20061228022606-pl02194x4z5n0zx3
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: norootid
        timestamp: Thu 2006-12-28 03:26:06 +0100
        message:
          Merge from upstream.
        ------------------------------------------------------------
        revno: 220.1.16.1.27
        merged: jelmer at samba.org-20061229164052-l6hr3ie3je9ae1zc
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: norootid
        timestamp: Fri 2006-12-29 17:40:52 +0100
        message:
          Merge upstream fixes.
        ------------------------------------------------------------
        revno: 220.1.16.1.28
        merged: jelmer at samba.org-20070101175406-z596p07otvo3c8jh
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: norootid
        timestamp: Mon 2007-01-01 18:54:06 +0100
        message:
          Merge upstream.
        ------------------------------------------------------------
        revno: 220.1.16.1.29
        merged: jelmer at samba.org-20070106232357-48ky0nd2e4aszen4
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: norootid
        timestamp: Sun 2007-01-07 00:23:57 +0100
        message:
          Merge upstream
        ------------------------------------------------------------
        revno: 220.1.16.1.30
        merged: jelmer at samba.org-20070201140904-wbok37h2amkxi590
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: norootid
        timestamp: Thu 2007-02-01 15:09:04 +0100
        message:
          merge upstream changes.
        ------------------------------------------------------------
        revno: 220.1.16.1.31
        merged: jelmer at samba.org-20070201141105-7v9zsg97gx0wi2sp
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: norootid
        timestamp: Thu 2007-02-01 15:11:05 +0100
        message:
          merge some more upstream changes.
        ------------------------------------------------------------
        revno: 220.1.16.1.32
        merged: jelmer at samba.org-20070315164004-f1du1t8vl0su7d6u
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: norootid
        timestamp: Thu 2007-03-15 17:40:04 +0100
        message:
          Merge dev tree.
        ------------------------------------------------------------
        revno: 220.1.16.1.33
        merged: jelmer at samba.org-20070315170940-qk2d50iho0q425wo
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: norootid
        timestamp: Thu 2007-03-15 18:09:40 +0100
        message:
          Reduce diff with main
        ------------------------------------------------------------
        revno: 220.1.16.1.34
        merged: jelmer at samba.org-20070315191637-cq9i4gv0ek5h3t0w
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: norootid
        timestamp: Thu 2007-03-15 20:16:37 +0100
        message:
          Fix some tests, simplify code
        ------------------------------------------------------------
        revno: 220.1.16.1.35
        merged: jelmer at samba.org-20070315191730-sp0ys1rb80x2xyh0
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: norootid
        timestamp: Thu 2007-03-15 20:17:30 +0100
        message:
          Merge dev fixes.
        ------------------------------------------------------------
        revno: 220.1.16.1.36
        merged: jelmer at samba.org-20070316002516-bixr1j3tebcjlcut
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: norootid
        timestamp: Fri 2007-03-16 01:25:16 +0100
        message:
          Map revision 0 in Subversion to a custom Bazaar revision rather than NULL_REVISION. This is required as 
          this is the revision that introduces the tree root.
        ------------------------------------------------------------
        revno: 220.1.16.1.37
        merged: jelmer at samba.org-20070316120902-otcjexd81jwavu9g
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: norootid
        timestamp: Fri 2007-03-16 13:09:02 +0100
        message:
          Fix some more tests.
        ------------------------------------------------------------
        revno: 220.1.16.1.38
        merged: jelmer at samba.org-20070316123851-mx9t5xdria4vpng6
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: norootid
        timestamp: Fri 2007-03-16 13:38:51 +0100
        message:
          Fix all but two tests.
        ------------------------------------------------------------
        revno: 220.1.16.1.39
        merged: jelmer at samba.org-20070316222524-8ftljpdlklsu4vre
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: norootid
        timestamp: Fri 2007-03-16 23:25:24 +0100
        message:
          Fix remaining tests.
    ------------------------------------------------------------
    revno: 220.1.182.1.35
    merged: jelmer at samba.org-20070317214040-o4vewd607anbvfme
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Sat 2007-03-17 22:40:40 +0100
    message:
      Merge patch from Aaron to prevent lots of warnings about out-of-date 
      Subversion bindings.
        ------------------------------------------------------------
        revno: 220.1.182.1.34.1.1
        merged: aaron.bentley at utoronto.ca-20070317212543-nhu7lx0cmlygkm17
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: svn
        timestamp: Sat 2007-03-17 17:25:43 -0400
        message:
          Avoid old subversion warning, except when opening checkouts.  Error instead.
    ------------------------------------------------------------
    revno: 220.1.182.1.36
    merged: jelmer at samba.org-20070319112336-stvy6ag2g60xhxva
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Mon 2007-03-19 12:23:36 +0100
    message:
      Merge two trivial fixes from the 0.3 branch.
    ------------------------------------------------------------
    revno: 220.1.182.1.37
    merged: jelmer at samba.org-20070319150900-bcmzs21lub8zihqa
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Mon 2007-03-19 16:09:00 +0100
    message:
      Fix incorrect merge.
    ------------------------------------------------------------
    revno: 220.1.182.1.38
    merged: aaron.bentley at utoronto.ca-20070328034659-ob4po9wj0tm3nz9m
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: svn
    timestamp: Tue 2007-03-27 23:46:59 -0400
    message:
      Skip tests that require SVN checkout support if unavailable
    ------------------------------------------------------------
    revno: 220.1.182.1.39
    merged: aaron.bentley at utoronto.ca-20070328040014-pcojau6cwlnyhm36
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: svn
    timestamp: Wed 2007-03-28 00:00:14 -0400
    message:
      Merge changes from mainline
        ------------------------------------------------------------
        revno: 220.1.182.1.37.1.1
        merged: jelmer at samba.org-20070323135406-xk28fwaqkj8iymvs
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: main
        timestamp: Fri 2007-03-23 14:54:06 +0100
        message:
          Bazaar-NG -> Bazaar, update version
        ------------------------------------------------------------
        revno: 220.1.182.1.37.1.2
        merged: jelmer at samba.org-20070325142008-s4xgn0ksym677933
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: main
        timestamp: Sun 2007-03-25 16:20:08 +0200
        message:
          Merge formatting fixes.
        ------------------------------------------------------------
        revno: 220.1.182.1.37.1.3
        merged: jelmer at samba.org-20070325184140-tjuwjts3rly7uypl
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: main
        timestamp: Sun 2007-03-25 20:41:40 +0200
        message:
          Merge some formatting fixes, add extra tests.
        ------------------------------------------------------------
        revno: 220.1.182.1.37.1.4
        merged: jelmer at samba.org-20070325195045-uqnuxhs254o2lbv3
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: main
        timestamp: Sun 2007-03-25 21:50:45 +0200
        message:
          Remove some unused imports.
    ------------------------------------------------------------
    revno: 220.1.182.1.40
    merged: aaron.bentley at utoronto.ca-20070328044959-oait3c16t9y716r8
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: svn
    timestamp: Wed 2007-03-28 00:49:59 -0400
    message:
      Don't use super because BzrError isn't always a new-style class
    ------------------------------------------------------------
    revno: 220.1.182.1.41
    merged: jelmer at samba.org-20070328121602-c6b3z2zc093l02h3
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Wed 2007-03-28 14:16:02 +0200
    message:
      Use short name.
    ------------------------------------------------------------
    revno: 220.1.182.1.42
    merged: jelmer at samba.org-20070415161553-4s5vprta60mch70r
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Sun 2007-04-15 18:15:53 +0200
    message:
      Merge some fixes from 0.3 branch.
    ------------------------------------------------------------
    revno: 220.1.182.1.43
    merged: jelmer at samba.org-20070502005238-juqk20xhks8t6501
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Wed 2007-05-02 02:52:38 +0200
    message:
      Try to fix a bug found by mwh's test.
    ------------------------------------------------------------
    revno: 220.1.182.1.44
    merged: jelmer at samba.org-20070502115715-4o1dliyaye1a6a3n
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Wed 2007-05-02 13:57:15 +0200
    message:
      Reproduce mwh bug with a simpler test function.
    ------------------------------------------------------------
    revno: 220.1.182.1.45
    merged: jelmer at samba.org-20070505141653-lzcfl8um8utc7yyc
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Sat 2007-05-05 16:16:53 +0200
    message:
      Convert working copy locking errors to Bazaar errors.
    ------------------------------------------------------------
    revno: 220.1.182.1.46
    merged: jelmer at samba.org-20070507163704-l1vvahgstjknx1sg
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2007-05-07 18:37:04 +0200
    message:
      Fix tests when using custom global ignores setting in ~/.subversion/config.
    ------------------------------------------------------------
    revno: 220.1.182.1.47
    merged: jelmer at samba.org-20070515225541-s3qdlzaz6tzdl99o
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Tue 2007-05-15 23:55:41 +0100
    message:
      Mark as compatibile with 0.17
    ------------------------------------------------------------
    revno: 220.1.182.1.48
    merged: jelmer at samba.org-20070516091151-5cnstft757privhr
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Wed 2007-05-16 10:11:51 +0100
    message:
      Make sure a correct exception is raised if get_revision_paths() 
      receives an invalid revision number.
    ------------------------------------------------------------
    revno: 220.1.182.1.49
    merged: jelmer at samba.org-20070516091932-yfr4vawpgkhhl4my
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Wed 2007-05-16 10:19:32 +0100
    message:
      Clarify what is considered a revision and what isn't.
    ------------------------------------------------------------
    revno: 220.1.182.1.50
    merged: jelmer at samba.org-20070516132803-atj347dynttwtwvv
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Wed 2007-05-16 14:28:03 +0100
    message:
      Fix mainline_revision_parent().
    ------------------------------------------------------------
    revno: 220.1.182.1.51
    merged: jelmer at samba.org-20070516133028-ykjexckioosx0vtn
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Wed 2007-05-16 14:30:28 +0100
    message:
      Merge the 0.3 branch.
    ------------------------------------------------------------
    revno: 220.1.182.1.52
    merged: jelmer at samba.org-20070517165231-jhmgh86gq5pzifuu
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Thu 2007-05-17 17:52:31 +0100
    message:
      Merge documentation improvements.
    ------------------------------------------------------------
    revno: 220.1.182.1.53
    merged: jelmer at samba.org-20070518180802-s4q66h2c1doer83a
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Fri 2007-05-18 19:08:02 +0100
    message:
      Merge support for true push and commits to heavy checkouts.
        ------------------------------------------------------------
        revno: 220.1.182.1.19.1.1
        merged: jelmer at samba.org-20070201173614-9rzjpk5puez5rj11
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: main
        timestamp: Thu 2007-02-01 18:36:14 +0100
        message:
          Initial work on push and support for setting revision id during commit.
        ------------------------------------------------------------
        revno: 220.1.182.1.19.1.2
        merged: jelmer at samba.org-20070306000852-1cosj7bj8khc5x7h
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: customrevids
        timestamp: Tue 2007-03-06 01:08:52 +0100
        message:
          Add test for overridden revids.
        ------------------------------------------------------------
        revno: 220.1.182.1.19.1.3
        merged: jelmer at samba.org-20070306001157-r1lnuw8wn7b8j8g9
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: customrevids
        timestamp: Tue 2007-03-06 01:11:57 +0100
        message:
          Merge upstream.
        ------------------------------------------------------------
        revno: 220.1.182.1.19.1.4
        merged: jelmer at samba.org-20070414180015-n29pge396twclo2t
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: customrevids
        timestamp: Sat 2007-04-14 20:00:15 +0200
        message:
          merge upstream
        ------------------------------------------------------------
        revno: 220.1.182.1.19.1.5
        merged: jelmer at samba.org-20070415173504-fiwgffj0ijbvqj44
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: customrevids
        timestamp: Sun 2007-04-15 19:35:04 +0200
        message:
          Merge upstream, add helper function for parsing revision ids on branches.
        ------------------------------------------------------------
        revno: 220.1.182.1.19.1.6
        merged: jelmer at samba.org-20070416013009-i1fs5ukhj3hg1i1i
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: customrevids
        timestamp: Mon 2007-04-16 03:30:09 +0200
        message:
          Fix a couple of tests.
        ------------------------------------------------------------
        revno: 220.1.182.1.19.1.7
        merged: jelmer at samba.org-20070416232957-4p8w07zrz9fgjk96
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: customrevids
        timestamp: Tue 2007-04-17 01:29:57 +0200
        message:
          Move revid code to separate file in preparation of expansion.
        ------------------------------------------------------------
        revno: 220.1.182.1.19.1.8
        merged: jelmer at samba.org-20070516134309-1kmi1dajlhf8rf01
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: customrevids
        timestamp: Wed 2007-05-16 14:43:09 +0100
        message:
          Merge upstream.
        ------------------------------------------------------------
        revno: 220.1.182.1.19.1.9
        merged: jelmer at samba.org-20070516230120-uuh3vny3euhn152h
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: customrevids
        timestamp: Thu 2007-05-17 00:01:20 +0100
        message:
          Start working on revision id map.
        ------------------------------------------------------------
        revno: 220.1.182.1.19.1.10
        merged: jelmer at samba.org-20070517110929-wc2u2ow9zbbausfn
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: customrevids
        timestamp: Thu 2007-05-17 12:09:29 +0100
        message:
          Add insert function.
        ------------------------------------------------------------
        revno: 220.1.182.1.19.1.11
        merged: jelmer at samba.org-20070517123813-4iij1urq1vea0spi
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: customrevids
        timestamp: Thu 2007-05-17 13:38:13 +0100
        message:
          Start filling in code to create the revid cache.
        ------------------------------------------------------------
        revno: 220.1.182.1.19.1.12
        merged: jelmer at samba.org-20070517190319-4p4vx3gl0mzjotd2
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: customrevids
        timestamp: Thu 2007-05-17 20:03:19 +0100
        message:
          Some more work towards custom revision ids.
        ------------------------------------------------------------
        revno: 220.1.182.1.19.1.13
        merged: jelmer at samba.org-20070517190430-nkqegxcff1gdobe4
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: customrevids
        timestamp: Thu 2007-05-17 20:04:30 +0100
        message:
          Merge upstream.
        ------------------------------------------------------------
        revno: 220.1.182.1.19.1.14
        merged: jelmer at samba.org-20070518004338-7iyyvupsj2en6tld
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: customrevids
        timestamp: Fri 2007-05-18 01:43:38 +0100
        message:
          Add some tests for the custom revisions.
        ------------------------------------------------------------
        revno: 220.1.182.1.19.1.15
        merged: jelmer at samba.org-20070518012526-sm3mjnioq93ub9iq
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: customrevids
        timestamp: Fri 2007-05-18 02:25:26 +0100
        message:
          Support setting the revision id on commits from lightweight checkouts.
        ------------------------------------------------------------
        revno: 220.1.182.1.19.1.16
        merged: jelmer at samba.org-20070518014626-kjicpl6y6qi5kad0
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: customrevids
        timestamp: Fri 2007-05-18 02:46:26 +0100
        message:
          Fix more custom revid tests.
        ------------------------------------------------------------
        revno: 220.1.182.1.19.1.17
        merged: jelmer at samba.org-20070518020115-f6opp2673mhvc9sg
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: customrevids
        timestamp: Fri 2007-05-18 03:01:15 +0100
        message:
          Support custom revision ids. True push is now just an hour or two away.................
        ------------------------------------------------------------
        revno: 220.1.182.1.19.1.18
        merged: jelmer at samba.org-20070518110606-ghip0jetjq210xdg
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: customrevids
        timestamp: Fri 2007-05-18 12:06:06 +0100
        message:
          Add separate tests for push-as-merged.
        ------------------------------------------------------------
        revno: 220.1.182.1.19.1.19
        merged: jelmer at samba.org-20070518122257-v826cvviwuo5xq8b
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: customrevids
        timestamp: Fri 2007-05-18 13:22:57 +0100
        message:
          True push works, with some limits.
        ------------------------------------------------------------
        revno: 220.1.182.1.19.1.20
        merged: jelmer at samba.org-20070518124612-sisoj3464r5wteu1
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: customrevids
        timestamp: Fri 2007-05-18 13:46:12 +0100
        message:
          Fix custom revision ids for per-file revision ids.
        ------------------------------------------------------------
        revno: 220.1.182.1.19.1.21
        merged: jelmer at samba.org-20070518151130-cy22ujf5331vk8wr
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: customrevids
        timestamp: Fri 2007-05-18 16:11:30 +0100
        message:
          Reduce the number of properties used.
        ------------------------------------------------------------
        revno: 220.1.182.1.19.1.22
        merged: jelmer at samba.org-20070518164929-14kc2rnucp1bx60y
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: customrevids
        timestamp: Fri 2007-05-18 17:49:29 +0100
        message:
          Fix the test suite, add tests for committing to heavyweight checkouts.
        ------------------------------------------------------------
        revno: 220.1.182.1.19.1.23
        merged: jelmer at samba.org-20070518173705-7e51s6m9bdn3h6wd
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: customrevids
        timestamp: Fri 2007-05-18 18:37:05 +0100
        message:
          Fix bind.
        ------------------------------------------------------------
        revno: 220.1.182.1.19.1.24
        merged: jelmer at samba.org-20070518180127-pbj2l7tgikgxe77h
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: customrevids
        timestamp: Fri 2007-05-18 19:01:27 +0100
        message:
          Support commits in heavy checkouts.
    ------------------------------------------------------------
    revno: 220.1.182.1.54
    merged: jelmer at samba.org-20070518191901-4j14rngulk88ksfy
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Fri 2007-05-18 20:19:01 +0100
    message:
      Trim missing features list.
    ------------------------------------------------------------
    revno: 220.1.182.1.55
    merged: jelmer at samba.org-20070519001208-9l1dyi9ny1s19gak
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Sat 2007-05-19 01:12:08 +0100
    message:
      Handle initial branch after push of custom revisions.
    ------------------------------------------------------------
    revno: 220.1.182.1.56
    merged: jelmer at samba.org-20070520213233-3d1gn6gogpsapnpc
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Sun 2007-05-20 22:32:33 +0100
    message:
      Merge fix for 115026
    ------------------------------------------------------------
    revno: 220.1.182.1.57
    merged: jelmer at samba.org-20070521004738-tm3gl0111564pd31
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Mon 2007-05-21 01:47:38 +0100
    message:
      Add test for DivergedBranches being raised.
    ------------------------------------------------------------
    revno: 220.1.182.1.58
    merged: jelmer at samba.org-20070521124126-td6r9qvrqgz9azlo
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Mon 2007-05-21 13:41:26 +0100
    message:
      Some more documentation.
    ------------------------------------------------------------
    revno: 220.1.182.1.59
    merged: jelmer at samba.org-20070522015615-j2hh7yy30ceqo8b5
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Tue 2007-05-22 02:56:15 +0100
    message:
      Fix use with python2.4 (patch by John Meinel).
    ------------------------------------------------------------
    revno: 220.1.182.1.60
    merged: jelmer at samba.org-20070527133530-oigy2iqo1qcgars0
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Sun 2007-05-27 15:35:30 +0200
    message:
      Some more docs, use different cache dir (to avoid conflicts with older installs.
    ------------------------------------------------------------
    revno: 220.1.182.1.61
    merged: jelmer at samba.org-20070527140010-41aozmkiwt42nes3
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sun 2007-05-27 16:00:10 +0200
    message:
      Fix typo.
    ------------------------------------------------------------
    revno: 220.1.182.1.62
    merged: jelmer at samba.org-20070527145252-d5bqmu83eocgt69y
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Sun 2007-05-27 16:52:52 +0200
    message:
      Fix bug in revid caching.
    ------------------------------------------------------------
    revno: 220.1.182.1.63
    merged: jelmer at samba.org-20070527161422-yub39px85sn7i44y
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Sun 2007-05-27 18:14:22 +0200
    message:
      Use right order of parameters to SubversionException().
    ------------------------------------------------------------
    revno: 220.1.182.1.64
    merged: jelmer at samba.org-20070527163512-x5blyfvkewd0pz6d
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Sun 2007-05-27 18:35:12 +0200
    message:
      Fix broken tests.
    ------------------------------------------------------------
    revno: 220.1.182.1.65
    merged: jelmer at samba.org-20070527193330-0q16hyeiv699y7na
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Sun 2007-05-27 21:33:30 +0200
    message:
      Implement SvnRaTransport.local_abspath(). (#117090)
    ------------------------------------------------------------
    revno: 220.1.182.1.66
    merged: jelmer at samba.org-20070527193659-zcx6qs5lga68k2ga
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Sun 2007-05-27 21:36:59 +0200
    message:
      Add test to make sure empty files can be pushed.
    ------------------------------------------------------------
    revno: 220.1.182.1.67
    merged: jelmer at samba.org-20070528122415-sx183zx1ojytpbis
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2007-05-28 14:24:15 +0200
    message:
      Implement create_branch().
    ------------------------------------------------------------
    revno: 220.1.182.1.68
    merged: jelmer at samba.org-20070528125817-nb4qanvq0rkjknkc
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2007-05-28 14:58:17 +0200
    message:
      Return last revision in which a branch was changed but existed rather than revision in which it was removed.
    ------------------------------------------------------------
    revno: 220.1.182.1.69
    merged: jelmer at samba.org-20070530181008-51yqhn2rt6h3opm3
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Wed 2007-05-30 20:10:08 +0200
    message:
      Clean up some FIXME's.
    ------------------------------------------------------------
    revno: 220.1.182.1.70
    merged: jelmer at samba.org-20070530225330-sckt6h6u9tuseefa
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Thu 2007-05-31 00:53:30 +0200
    message:
      Suggest --allow-changes.
    ------------------------------------------------------------
    revno: 220.1.182.1.71
    merged: jelmer at samba.org-20070530231847-cugtkauk7sf0846w
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Thu 2007-05-31 01:18:47 +0200
    message:
      Add some docstrings.
    ------------------------------------------------------------
    revno: 220.1.182.1.72
    merged: jelmer at samba.org-20070530234529-7ngb7jvvs9lcnhlz
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Thu 2007-05-31 01:45:29 +0200
    message:
      Add trivial test for get_physical_lock_status().
    ------------------------------------------------------------
    revno: 220.1.182.1.73
    merged: jelmer at samba.org-20070530234844-fdypogjbpz4bqibi
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Thu 2007-05-31 01:48:44 +0200
    message:
      Fix some docstrings, remove obsolete functions.
    ------------------------------------------------------------
    revno: 220.1.182.1.74
    merged: jelmer at samba.org-20070601133034-bhha7815r794nxny
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Fri 2007-06-01 15:30:34 +0200
    message:
      Try to avoid using revision_history() for performance reasons.
    ------------------------------------------------------------
    revno: 220.1.182.1.75
    merged: jelmer at samba.org-20070615195845-nx1dcj5f1bpjp48w
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Fri 2007-06-15 21:58:45 +0200
    message:
      Convert SVN_ERR_RA_NOT_AUTHORIZED errors correctly.
    ------------------------------------------------------------
    revno: 220.1.182.1.76
    merged: jelmer at samba.org-20070616234338-1mpcjqfk21yj3wch
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sun 2007-06-17 01:43:38 +0200
    message:
      Require rich root repositories.
    ------------------------------------------------------------
    revno: 220.1.182.1.77
    merged: jelmer at samba.org-20070617114028-u3ifjfjbpiwsxfda
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sun 2007-06-17 13:40:28 +0200
    message:
      Add tests for revision_id_to_revno() in preparation of a much faster implementation.
    ------------------------------------------------------------
    revno: 220.1.182.1.78
    merged: jelmer at samba.org-20070617121841-1vxzlchw2a2mut5r
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sun 2007-06-17 14:18:41 +0200
    message:
      Avoid expensive calls.
    ------------------------------------------------------------
    revno: 220.1.182.1.79
    merged: jelmer at samba.org-20070617161027-kq8wutb34ua8epv5
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sun 2007-06-17 18:10:27 +0200
    message:
      Store bzr revnum in revision-id-vX property, should make revid-to-revno lookups a lot cheaper (and not scale by the size of history).
    ------------------------------------------------------------
    revno: 220.1.182.1.80
    merged: jelmer at samba.org-20070617163902-8ixbyu6latoi8icf
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sun 2007-06-17 18:39:02 +0200
    message:
      Deal properly with invalid property values.
    ------------------------------------------------------------
    revno: 220.1.182.1.81
    merged: jelmer at samba.org-20070617170706-lb8jlvqosxt8cjm2
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sun 2007-06-17 19:07:06 +0200
    message:
      Add another check
    ------------------------------------------------------------
    revno: 220.1.182.1.82
    merged: jelmer at samba.org-20070617170946-pdbzo8u3r2amljyr
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sun 2007-06-17 19:09:46 +0200
    message:
      Create shared repositories by default when using svn-import.
    ------------------------------------------------------------
    revno: 220.1.182.1.83
    merged: jelmer at samba.org-20070617194641-iq3j2gomdrnkdzwz
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sun 2007-06-17 21:46:41 +0200
    message:
      Oops, missed one spot.
    ------------------------------------------------------------
    revno: 220.1.182.1.84
    merged: jelmer at samba.org-20070617204921-wmgosgsgz92xftep
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sun 2007-06-17 22:49:21 +0200
    message:
      Add dist_to_origin field to revmap.
    ------------------------------------------------------------
    revno: 220.1.182.1.85
    merged: jelmer at samba.org-20070617205608-d6n5t6shdq3c77pg
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sun 2007-06-17 22:56:08 +0200
    message:
      Fix test.
    ------------------------------------------------------------
    revno: 220.1.182.1.86
    merged: jelmer at samba.org-20070618203307-mfa3swlxm30x19uj
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Mon 2007-06-18 22:33:07 +0200
    message:
      Keep cache of revnos to reduce number of calls to revision_history().
    ------------------------------------------------------------
    revno: 220.1.182.1.87
    merged: jelmer at samba.org-20070624140849-6ijkriw19gdih4jz
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Sun 2007-06-24 16:08:49 +0200
    message:
      Support custom branching schemes and make the branching scheme name part of the 
      revision id.
    ------------------------------------------------------------
    revno: 220.1.182.1.88
    merged: jelmer at samba.org-20070624175251-v165quq77m6ey7ej
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Sun 2007-06-24 19:52:51 +0200
    message:
      Allow only opening branches that actually exist.
      Remove more uses of self.scheme in repositories.
    ------------------------------------------------------------
    revno: 220.1.182.1.89
    merged: jelmer at samba.org-20070624181404-olgk0xm9gvhl97rf
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Sun 2007-06-24 20:14:04 +0200
    message:
      Merge 0.3.4 release.
    ------------------------------------------------------------
    revno: 220.1.182.1.90
    merged: jelmer at samba.org-20070624193508-2f21180q93i5v5bx
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Sun 2007-06-24 21:35:08 +0200
    message:
      Add config objects for repositories.
    ------------------------------------------------------------
    revno: 220.1.182.1.91
    merged: jelmer at samba.org-20070624201354-uiz245ufev3v94ee
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Sun 2007-06-24 22:13:54 +0200
    message:
      Remember locations and branching scheme.
    ------------------------------------------------------------
    revno: 220.1.182.1.92
    merged: jelmer at samba.org-20070624204720-1crph8q70ghf54l2
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Sun 2007-06-24 22:47:20 +0200
    message:
      Use right test dirs.
    ------------------------------------------------------------
    revno: 220.1.182.1.93
    merged: jelmer at samba.org-20070624214328-jd6mfvyep9ug32ao
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Sun 2007-06-24 23:43:28 +0200
    message:
      Move fetch tests to separate file.
    ------------------------------------------------------------
    revno: 220.1.182.1.94
    merged: jelmer at samba.org-20070624231937-ikhtyqlkourqqorc
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Mon 2007-06-25 01:19:37 +0200
    message:
      Implement needs_format_conversion().
    ------------------------------------------------------------
    revno: 220.1.182.1.95
    merged: jelmer at samba.org-20070624232120-rpsynq9yhsyrn4q5
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Mon 2007-06-25 01:21:20 +0200
    message:
      Refactory convert_repository().
    ------------------------------------------------------------
    revno: 220.1.182.1.96
    merged: jelmer at samba.org-20070624233340-fyypx48cco4esw6h
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Mon 2007-06-25 01:33:40 +0200
    message:
      Add conversion checks.
    ------------------------------------------------------------
    revno: 220.1.182.1.97
    merged: jelmer at samba.org-20070625003458-27t93mj1qpy3igse
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Mon 2007-06-25 02:34:58 +0200
    message:
      Fix test.
    ------------------------------------------------------------
    revno: 220.1.182.1.98
    merged: jelmer at samba.org-20070626194359-bfkp1u7dcze8dnh1
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Tue 2007-06-26 21:43:59 +0200
    message:
      Fix svn-import.
    ------------------------------------------------------------
    revno: 220.1.182.1.99
    merged: jelmer at samba.org-20070626200724-b0mt1hsm0lj0gqf4
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Tue 2007-06-26 22:07:24 +0200
    message:
      Add indexes - thanks to spiv for pointing out.
    ------------------------------------------------------------
    revno: 220.1.182.1.100
    merged: jelmer at samba.org-20070626203254-pcea47bzqxv3wkw5
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Tue 2007-06-26 22:32:54 +0200
    message:
      Remove debug output.
    ------------------------------------------------------------
    revno: 220.1.182.1.101
    merged: jelmer at samba.org-20070702220913-jyqdbylhwszzlujy
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Tue 2007-07-03 00:09:13 +0200
    message:
      Add test for svn-import with dumpfile. Fixes #123493
    ------------------------------------------------------------
    revno: 220.1.182.1.102
    merged: jelmer at samba.org-20070703003000-3js37ggc5tuv00ll
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Tue 2007-07-03 02:30:00 +0200
    message:
      Add blackbox tests for "bzr ls" and "bzr info"
    ------------------------------------------------------------
    revno: 220.1.182.1.103
    merged: jelmer at samba.org-20070703003108-9dpwi3s0hl50xhld
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Tue 2007-07-03 02:31:08 +0200
    message:
      Add some extra checks, fix issues with unicode.
    ------------------------------------------------------------
    revno: 220.1.182.1.104
    merged: jelmer at samba.org-20070703164254-bpp3awscz1jr52fa
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2007-07-03 18:42:54 +0200
    message:
      Consistently treat property changes as actual changes (#122115)
    ------------------------------------------------------------
    revno: 220.1.182.1.105
    merged: jelmer at samba.org-20070704142127-06cs6cj5i9osjc16
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Wed 2007-07-04 16:21:27 +0200
    message:
      Depend on the rebase plugin for svn-upgrade.
    ------------------------------------------------------------
    revno: 220.1.182.1.106
    merged: jelmer at samba.org-20070704170231-asdxu22i79f8k9lo
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Wed 2007-07-04 19:02:31 +0200
    message:
      Re-implement the svn-upgrade command on top of bzr-rebase.
    ------------------------------------------------------------
    revno: 220.1.182.1.107
    merged: jelmer at samba.org-20070704212352-kodoe5uul8r47fqz
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Wed 2007-07-04 23:23:52 +0200
    message:
      Deal with the undefined branching scheme, for backwards compatibility.
    ------------------------------------------------------------
    revno: 220.1.182.1.108
    merged: jelmer at samba.org-20070704213340-2vdea0othb2leoms
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Wed 2007-07-04 23:33:40 +0200
    message:
      Simple speed optimizations.
    ------------------------------------------------------------
    revno: 220.1.182.1.109
    merged: jelmer at samba.org-20070704231159-js1y7mxto2gkfg90
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Thu 2007-07-05 01:11:59 +0200
    message:
      Deal with working trees in svn-upgrade.
    ------------------------------------------------------------
    revno: 220.1.182.1.110
    merged: jelmer at samba.org-20070705020917-wwqajlp8orylc148
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Thu 2007-07-05 04:09:17 +0200
    message:
      Add SingleBranchingScheme.
    ------------------------------------------------------------
    revno: 220.1.182.1.111
    merged: jelmer at samba.org-20070705021037-vo7x4mnvg7a4bv5q
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Thu 2007-07-05 04:10:37 +0200
    message:
      Simplification.
    ------------------------------------------------------------
    revno: 220.1.182.1.112
    merged: jelmer at samba.org-20070705093605-uxas60wc7x44nco5
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Thu 2007-07-05 11:36:05 +0200
    message:
      Remove --allow-changes argument to svn-upgrade: it's always needed.
    ------------------------------------------------------------
    revno: 220.1.182.1.113
    merged: jelmer at samba.org-20070705103229-tiahwcgwm7lokboq
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Thu 2007-07-05 12:32:29 +0200
    message:
      Another optimization.
    ------------------------------------------------------------
    revno: 220.1.182.1.114
    merged: jelmer at samba.org-20070708141353-6npnskwaakaak292
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sun 2007-07-08 15:13:53 +0100
    message:
      Update mapping for singlebranchingscheme.
    ------------------------------------------------------------
    revno: 220.1.182.1.115
    merged: jelmer at samba.org-20070709164826-v6kgvuded2zl16qx
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2007-07-09 17:48:26 +0100
    message:
      Don't be verbose when trying to connect unless -Dtransport was specified. Fixes #124858.
    ------------------------------------------------------------
    revno: 220.1.182.1.116
    merged: jelmer at samba.org-20070710032434-q4a4hkcymd1i0ox3
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2007-07-10 04:24:34 +0100
    message:
      Merge tets fixes.
        ------------------------------------------------------------
        revno: 220.1.182.1.113.1.1
        merged: jelmer at samba.org-20070705162811-spxhzl1p7xwcfyvj
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: 0.4
        timestamp: Thu 2007-07-05 18:28:11 +0200
        message:
          Fix some tests.
    ------------------------------------------------------------
    revno: 220.1.182.1.117
    merged: jelmer at samba.org-20070710133459-1gbetnemqb3pgvp1
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2007-07-10 14:34:59 +0100
    message:
      Add -v option to svn-upgrade.
    ------------------------------------------------------------
    revno: 220.1.182.1.118
    merged: jelmer at samba.org-20070710150136-roo08q723iiq6k3g
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2007-07-10 16:01:36 +0100
    message:
      Update todo.
    ------------------------------------------------------------
    revno: 220.1.182.1.119
    merged: jelmer at samba.org-20070712085012-4givggs5uymua380
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Thu 2007-07-12 11:50:12 +0300
    message:
      Rename checkout to workingtree, mark 0.4 as being compatible with just 0.18.
    ------------------------------------------------------------
    revno: 220.1.182.1.120
    merged: jelmer at samba.org-20070712090326-em3zgjramwc2ff2y
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Thu 2007-07-12 12:03:26 +0300
    message:
      Fix locking issues with working tree (#125212).
    ------------------------------------------------------------
    revno: 220.1.182.1.121
    merged: jelmer at samba.org-20070712100827-v4hkpdatn1771hgx
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Thu 2007-07-12 13:08:27 +0300
    message:
      Implement smart_add for working tree.
    ------------------------------------------------------------
    revno: 220.1.182.1.122
    merged: jelmer at samba.org-20070712124222-t6y13tmcn609d0kw
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Thu 2007-07-12 15:42:22 +0300
    message:
      Mention bug #
    ------------------------------------------------------------
    revno: 220.1.182.1.123
    merged: jelmer at samba.org-20070712130714-yeyc40asj743ygci
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Thu 2007-07-12 16:07:14 +0300
    message:
      Merge interface sanitation.
        ------------------------------------------------------------
        revno: 220.1.182.1.118.1.1
        merged: jelmer at samba.org-20070712083651-u8l1dci17b2t46gy
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: newbranch
        timestamp: Thu 2007-07-12 11:36:51 +0300
        message:
          Saner interface to Subversion delta editors.
    ------------------------------------------------------------
    revno: 220.1.182.1.124
    merged: jelmer at samba.org-20070713094309-y3e5iduu3g3anxqw
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2007-07-13 12:43:09 +0300
    message:
      Use branching scheme stored in ~/.bazaar/subversion.conf.
    ------------------------------------------------------------
    revno: 220.1.182.1.125
    merged: jelmer at samba.org-20070713101121-mor3bvltp2pyjheo
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2007-07-13 13:11:21 +0300
    message:
      Add __str__ to ListBranchingScheme.
    ------------------------------------------------------------
    revno: 220.1.182.1.126
    merged: jelmer at samba.org-20070713101734-yvgxs558lh7lcvu2
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2007-07-13 13:17:34 +0300
    message:
      Add docstring, no longer default to TrunkBranchingScheme() but to the scheme specified in ~/.bazaar/subversion.conf.
    ------------------------------------------------------------
    revno: 220.1.182.1.127
    merged: jelmer at samba.org-20070713102746-i2dygg1cv2ke9eiw
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2007-07-13 13:27:46 +0300
    message:
      Support parsing list scheme texts.
    ------------------------------------------------------------
    revno: 220.1.182.1.128
    merged: jelmer at samba.org-20070713103218-ujothzh4z6t0ju6k
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2007-07-13 13:32:18 +0300
    message:
      Add branching scheme property.
    ------------------------------------------------------------
    revno: 220.1.182.1.129
    merged: jelmer at samba.org-20070713103740-lg11uomlspi8kbu1
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2007-07-13 13:37:40 +0300
    message:
      Let config return a BranchingScheme instance rather than just a string.
    ------------------------------------------------------------
    revno: 220.1.182.1.130
    merged: jelmer at samba.org-20070713113725-defdfi26ku3x2ppb
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2007-07-13 14:37:25 +0300
    message:
      Fix some tests, support setting the branching scheme in a file property on the repository root.
    ------------------------------------------------------------
    revno: 220.1.182.1.131
    merged: jelmer at samba.org-20070713144243-gibzp0yq29b9k97s
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2007-07-13 17:42:43 +0300
    message:
      Don't warn when using next development version of bzr.
    ------------------------------------------------------------
    revno: 220.1.182.1.132
    merged: jelmer at samba.org-20070713155250-uwk3ndc1o3qafuv4
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2007-07-13 18:52:50 +0300
    message:
      Warn when used with experimental version of mappings. (#117198), use lazy imports when possible.
    ------------------------------------------------------------
    revno: 220.1.182.1.133
    merged: jelmer at samba.org-20070714122743-yp9mkj8342vf96so
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sat 2007-07-14 15:27:43 +0300
    message:
      Avoid using deprecated function.
    ------------------------------------------------------------
    revno: 220.1.182.1.134
    merged: jelmer at samba.org-20070714122831-eqtp601rn3l1rfq2
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sat 2007-07-14 15:28:31 +0300
    message:
      Fix grammar.
    ------------------------------------------------------------
    revno: 220.1.182.1.135
    merged: jelmer at samba.org-20070714122959-gsxaghhdgys8jnsd
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sat 2007-07-14 15:29:59 +0300
    message:
      Check for and use safe file ids.
    ------------------------------------------------------------
    revno: 220.1.182.1.136
    merged: jelmer at samba.org-20070716134336-k8sunv08wk52za59
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2007-07-16 15:43:36 +0200
    message:
      Always use a branching scheme.
    ------------------------------------------------------------
    revno: 220.1.182.1.137
    merged: jelmer at samba.org-20070716135237-pkysoosb3n18joqn
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2007-07-16 15:52:37 +0200
    message:
      Initial work supporting write locks
    ------------------------------------------------------------
    revno: 220.1.182.1.138
    merged: jelmer at samba.org-20070716140148-2503h8av21cwcwgz
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2007-07-16 16:01:48 +0200
    message:
      Update TODO.
    ------------------------------------------------------------
    revno: 220.1.182.1.139
    merged: jelmer at samba.org-20070716151316-gmsmgmly95yu4y5p
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2007-07-16 17:13:16 +0200
    message:
      Fix tests.
    ------------------------------------------------------------
    revno: 220.1.182.1.140
    merged: jelmer at samba.org-20070716173844-1hkxm79aeo6cdyta
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2007-07-16 19:38:44 +0200
    message:
      Add getter for Branch.branch_path.
    ------------------------------------------------------------
    revno: 220.1.182.1.141
    merged: jelmer at samba.org-20070716233221-73i8pq15u2xprro3
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2007-07-17 01:32:21 +0200
    message:
      Remove extra mutter call.
    ------------------------------------------------------------
    revno: 220.1.182.1.142
    merged: jelmer at samba.org-20070716233330-b53bk7g0g4se3pp0
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2007-07-17 01:33:30 +0200
    message:
      Merge support for creating new branches using push.
        ------------------------------------------------------------
        revno: 220.1.182.1.118.1.2
        merged: jelmer at samba.org-20070715224229-adn0vystv3yqrf35
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: newbranch
        timestamp: Mon 2007-07-16 00:42:29 +0200
        message:
          Merge upstream.
        ------------------------------------------------------------
        revno: 220.1.182.1.118.1.3
        merged: jelmer at samba.org-20070716011319-8xw4a7uq7gnueunk
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: newbranch
        timestamp: Mon 2007-07-16 03:13:19 +0200
        message:
          Fix locking bug.
        ------------------------------------------------------------
        revno: 220.1.182.1.118.1.4
        merged: jelmer at samba.org-20070716013402-9ng1zrhlu4xptd1a
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: newbranch
        timestamp: Mon 2007-07-16 03:34:02 +0200
        message:
          Add some rename tests
        ------------------------------------------------------------
        revno: 220.1.182.1.118.1.5
        merged: jelmer at samba.org-20070716013419-hwitawuawyzymfi7
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: newbranch
        timestamp: Mon 2007-07-16 03:34:19 +0200
        message:
          More work on supporting creating branches.
        ------------------------------------------------------------
        revno: 220.1.182.1.118.1.6
        merged: jelmer at samba.org-20070716110753-nhkqxtc0wjlf3mzc
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: newbranch
        timestamp: Mon 2007-07-16 13:07:53 +0200
        message:
          Some work on supporting different branch paths in SvnCommitBuilder.
        ------------------------------------------------------------
        revno: 220.1.182.1.118.1.7
        merged: jelmer at samba.org-20070716151913-u7d9x2vfbbxd403k
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: newbranch
        timestamp: Mon 2007-07-16 17:19:13 +0200
        message:
          Merge upstream.
        ------------------------------------------------------------
        revno: 220.1.182.1.118.1.8
        merged: jelmer at samba.org-20070716171336-63n7cvb2lr2hxlor
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: newbranch
        timestamp: Mon 2007-07-16 19:13:36 +0200
        message:
          Support pushing revisions on top of revisions in different branch paths.
        ------------------------------------------------------------
        revno: 220.1.182.1.118.1.9
        merged: jelmer at samba.org-20070716181649-we5pzeuh3eckit3n
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: newbranch
        timestamp: Mon 2007-07-16 20:16:49 +0200
        message:
          Fill in functions for creating new branches.
        ------------------------------------------------------------
        revno: 220.1.182.1.118.1.10
        merged: jelmer at samba.org-20070716181756-r35lx6gs4hjmm2ef
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: newbranch
        timestamp: Mon 2007-07-16 20:17:56 +0200
        message:
          Merge upstream.
        ------------------------------------------------------------
        revno: 220.1.182.1.118.1.11
        merged: jelmer at samba.org-20070716185442-jqegcnqqswza05yx
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: newbranch
        timestamp: Mon 2007-07-16 20:54:42 +0200
        message:
          Support pushing new branches.
        ------------------------------------------------------------
        revno: 220.1.182.1.118.1.12
        merged: jelmer at samba.org-20070716191427-u7g51xkfdfpbdac3
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: newbranch
        timestamp: Mon 2007-07-16 21:14:27 +0200
        message:
          Add command for creating new branches using push.
        ------------------------------------------------------------
        revno: 220.1.182.1.118.1.13
        merged: jelmer at samba.org-20070716233124-7y30kkrr8ds3itbt
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: newbranch
        timestamp: Tue 2007-07-17 01:31:24 +0200
        message:
          Add -r option, rename svn-push-new-branch to svn-push-new.
    ------------------------------------------------------------
    revno: 220.1.182.1.143
    merged: jelmer at samba.org-20070717131201-lpgui0fat5n8iax3
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2007-07-17 15:12:01 +0200
    message:
      Only warn when bzr-svn is actually used.
    ------------------------------------------------------------
    revno: 220.1.182.1.144
    merged: jelmer at samba.org-20070717142317-x24jlddrdcxyl3ci
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2007-07-17 16:23:17 +0200
    message:
      Fix tests, bunch of performance improvements.
    ------------------------------------------------------------
    revno: 220.1.182.1.145
    merged: jelmer at samba.org-20070717144857-vo4kgn5cleh2zpu9
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2007-07-17 16:48:57 +0200
    message:
      Avoid filling the cache database with useless entries.
    ------------------------------------------------------------
    revno: 220.1.182.1.146
    merged: jelmer at samba.org-20070717154512-b4dktwqr6gxvex2s
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2007-07-17 17:45:12 +0200
    message:
      Some minor fixes, update TODO.
    ------------------------------------------------------------
    revno: 220.1.182.1.147
    merged: jelmer at samba.org-20070717154609-pg9dvzz8clzgg7io
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2007-07-17 17:46:09 +0200
    message:
      Merge README update from Mikhail Sobolev.
        ------------------------------------------------------------
        revno: 220.1.182.1.139.1.1
        merged: mss at mawhrin.net-20070716200940-xb6ux2ct3hovghc4
        committer: Mikhail Sobolev <mss at mawhrin.net>
        branch nick: bzr-svn.dev
        timestamp: Mon 2007-07-16 23:09:40 +0300
        message:
          a minor cosmetic change for svn-cache/README: put the link to the actual wiki page
    ------------------------------------------------------------
    revno: 220.1.182.1.148
    merged: jelmer at samba.org-20070717194431-sw030agm2ffbak7d
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2007-07-17 21:44:31 +0200
    message:
      Make sure last_revnum isn't cached, make proving a revid isn't present quicker.
    ------------------------------------------------------------
    revno: 220.1.182.1.149
    merged: jelmer at samba.org-20070717201105-uglj36gl3m5wr0iw
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2007-07-17 22:11:05 +0200
    message:
      Fix some broken tests.
    ------------------------------------------------------------
    revno: 220.1.182.1.150
    merged: jelmer at samba.org-20070717204931-t6vibqtun2g0n8yi
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2007-07-17 22:49:31 +0200
    message:
      Make sure right exceptions are raised.
    ------------------------------------------------------------
    revno: 220.1.182.1.151
    merged: jelmer at samba.org-20070717222148-inu96spvtsqwns2u
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Wed 2007-07-18 00:21:48 +0200
    message:
      Clearer error when branch specified as svn-import argument. (#121391)
    ------------------------------------------------------------
    revno: 220.1.182.1.152
    merged: jelmer at samba.org-20070718120302-sv43uuk4d3l5jkzh
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Wed 2007-07-18 14:03:02 +0200
    message:
      Update NEWS.
    ------------------------------------------------------------
    revno: 220.1.182.1.153
    merged: jelmer at samba.org-20070718122455-sc4k8bk4m3ay0sv2
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Wed 2007-07-18 14:24:55 +0200
    message:
      Store urls without trailing slash.
    ------------------------------------------------------------
    revno: 220.1.182.1.154
    merged: jelmer at samba.org-20070718130701-8f2c2dqh6acm0xjp
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Wed 2007-07-18 15:07:01 +0200
    message:
      Add --prefix option to svn-import.
    ------------------------------------------------------------
    revno: 220.1.182.1.155
    merged: jelmer at samba.org-20070718133125-1hwf9vl6sr60hlup
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Wed 2007-07-18 15:31:25 +0200
    message:
      Update TODO.
    ------------------------------------------------------------
    revno: 220.1.182.1.156
    merged: jelmer at samba.org-20070718170139-qow9ozku4vbpe7sy
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Wed 2007-07-18 19:01:39 +0200
    message:
      Add function for determining commit paths.
    ------------------------------------------------------------
    revno: 220.1.182.1.157
    merged: jelmer at samba.org-20070719154815-c0dg3b546yudw2jo
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Thu 2007-07-19 17:48:15 +0200
    message:
      Improve heuristics for determining branching schemes.
    ------------------------------------------------------------
    revno: 220.1.182.1.158
    merged: jelmer at samba.org-20070719161554-89gpjr8q3tpbmhu8
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Thu 2007-07-19 18:15:54 +0200
    message:
      Fix bug in scheme guessing code, add 'bzr help svn-branching-schemes'
    ------------------------------------------------------------
    revno: 220.1.182.1.159
    merged: jelmer at samba.org-20070719173423-zs8qktejmpqkzwoy
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Thu 2007-07-19 19:34:23 +0200
    message:
      More work on intelligent guessing of branching schemes.
    ------------------------------------------------------------
    revno: 220.1.182.1.160
    merged: jelmer at samba.org-20070719173933-2wbrw5rww3p5sx5c
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Thu 2007-07-19 19:39:33 +0200
    message:
      Error out when creating a new branch in a repository that already has revisions.
    ------------------------------------------------------------
    revno: 220.1.182.1.161
    merged: jelmer at samba.org-20070719174334-1k2d4dhdkiy65m3j
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Thu 2007-07-19 19:43:34 +0200
    message:
      always warn about missing subversion bindings.
    ------------------------------------------------------------
    revno: 220.1.182.1.162
    merged: jelmer at samba.org-20070719180935-n0aar9r1el5sxryl
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Thu 2007-07-19 20:09:35 +0200
    message:
      Fix tests.
    ------------------------------------------------------------
    revno: 220.1.182.1.163
    merged: jelmer at samba.org-20070719225311-xo5uapul9rny71y8
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2007-07-20 00:53:11 +0200
    message:
      Support wildcards in listbranching schemes
    ------------------------------------------------------------
    revno: 220.1.182.1.164
    merged: jelmer at samba.org-20070719233215-ajo3mbdjew2qhk4v
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2007-07-20 01:32:15 +0200
    message:
      Import bzrlib for correctly displaying warnings.
    ------------------------------------------------------------
    revno: 220.1.182.1.165
    merged: jelmer at samba.org-20070720001747-rdg4ca7v90uzsxl5
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2007-07-20 02:17:47 +0200
    message:
      Initial work on support for 1.5 interfaces.
    ------------------------------------------------------------
    revno: 220.1.182.1.166
    merged: jelmer at samba.org-20070720002641-ehn7muboul57m36n
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2007-07-20 02:26:41 +0200
    message:
      Support Subversion 1.5.
    ------------------------------------------------------------
    revno: 220.1.182.1.167
    merged: jelmer at samba.org-20070720023356-ak221851qv0qr2qw
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2007-07-20 04:33:56 +0200
    message:
      Handle the fact that svn 1.5 returns a tuple rather than a singleton.
    ------------------------------------------------------------
    revno: 220.1.182.1.168
    merged: jelmer at samba.org-20070720122718-519cdx6fbu1ykf49
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2007-07-20 14:27:18 +0200
    message:
      More compatibility fixes for Subversion 1.5.
    ------------------------------------------------------------
    revno: 220.1.182.1.169
    merged: jelmer at samba.org-20070720164022-5786c8gvw5z0mlyt
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2007-07-20 18:40:22 +0200
    message:
      Start registering formats so they get tested by bzr.
    ------------------------------------------------------------
    revno: 220.1.182.1.170
    merged: jelmer at samba.org-20070721012413-v513jr7hbh3oqdn1
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sat 2007-07-21 03:24:13 +0200
    message:
      Add some extra tests for file ids, update documentation. Set revision properties after changing root rather than before so they can be altered during the commit.
    ------------------------------------------------------------
    revno: 220.1.182.1.171
    merged: jelmer at samba.org-20070721013413-8w20kk45rfhem657
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sat 2007-07-21 03:34:13 +0200
    message:
      Fix compatibility with 1.4 (tx_apply also appears to be available there but be different.)
    ------------------------------------------------------------
    revno: 220.1.182.1.172
    merged: jelmer at samba.org-20070721132444-ttaqfohfosdm2hg3
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sat 2007-07-21 15:24:44 +0200
    message:
      Add some extra checks.
    ------------------------------------------------------------
    revno: 220.1.182.1.173
    merged: jelmer at samba.org-20070721135753-rm9hsh2siqgw50bb
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sat 2007-07-21 15:57:53 +0200
    message:
      Use read locks on Branch.
    ------------------------------------------------------------
    revno: 220.1.182.1.174
    merged: jelmer at samba.org-20070721142802-k7ubkx4u0yyzy9ed
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sat 2007-07-21 16:28:02 +0200
    message:
      Make to_revnum argument optional.
    ------------------------------------------------------------
    revno: 220.1.182.1.175
    merged: jelmer at samba.org-20070721153830-7nfo2olgb0ag4iuc
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sat 2007-07-21 17:38:30 +0200
    message:
      Fix svk:merge imports.
    ------------------------------------------------------------
    revno: 220.1.182.1.176
    merged: jelmer at samba.org-20070721162935-c2mlf1zb5xl8w2no
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sat 2007-07-21 18:29:35 +0200
    message:
      Rename bzr:merge -> bzr:ancestry:v3-SCHEME.
    ------------------------------------------------------------
    revno: 220.1.182.1.177
    merged: jelmer at samba.org-20070721170701-rrhgav7n4zc45sf2
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sat 2007-07-21 19:07:01 +0200
    message:
      add test for parse_merge.
    ------------------------------------------------------------
    revno: 220.1.182.1.178
    merged: jelmer at samba.org-20070722004032-5fnmj2ixxwuyn9ys
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sun 2007-07-22 02:40:32 +0200
    message:
      Fix tests that sometimes fell over.
    ------------------------------------------------------------
    revno: 220.1.182.1.179
    merged: jelmer at samba.org-20070722120441-zrpwaq2ksojxudra
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sun 2007-07-22 14:04:41 +0200
    message:
      Fix another sometimes-failing test.
    ------------------------------------------------------------
    revno: 220.1.182.1.180
    merged: jelmer at samba.org-20070723132054-u2zpdwqt5y2u4enu
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2007-07-23 15:20:54 +0200
    message:
      Avoid os.path.join() for URLs.
      Avoid calls to last_revision() in commit.
    ------------------------------------------------------------
    revno: 220.1.182.1.181
    merged: jelmer at samba.org-20070723135607-zfr7ebm4wt6zc55a
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2007-07-23 15:56:07 +0200
    message:
      Add some extra checks, fix formatting, split up large constructor of SvnCommitBuilder.
    ------------------------------------------------------------
    revno: 220.1.182.1.182
    merged: jelmer at samba.org-20070723152840-yolm2s2ikgt8ft2b
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2007-07-23 17:28:40 +0200
    message:
      Fix issues forgetting to remove files when deleting.
    ------------------------------------------------------------
    revno: 220.1.182.1.183
    merged: jelmer at samba.org-20070723160449-4paus0gm8r2ofh7v
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2007-07-23 18:04:49 +0200
    message:
      Add some tests for import_branch().
    ------------------------------------------------------------
    revno: 220.1.182.1.184
    merged: jelmer at samba.org-20070723165433-65gpusqjn0enoq7l
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2007-07-23 18:54:33 +0200
    message:
      Simplify import code, handle corner cases pushing deletes.
    ------------------------------------------------------------
    revno: 220.1.182.1.185
    merged: jelmer at samba.org-20070723172131-sxmll02ka6u1p8q1
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2007-07-23 19:21:31 +0200
    message:
      Update TODO, be a bit quieter.
    ------------------------------------------------------------
    revno: 220.1.182.1.186
    merged: jelmer at samba.org-20070723180840-t4kb53t5rfy03kj6
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2007-07-23 20:08:40 +0200
    message:
      Fix two deprecation warnings.
    ------------------------------------------------------------
    revno: 220.1.182.1.187
    merged: jelmer at samba.org-20070723181249-4mnq2r7u9z0cubq4
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2007-07-23 20:12:49 +0200
    message:
      Handle another corner case pushing.
    ------------------------------------------------------------
    revno: 220.1.182.1.188
    merged: jelmer at samba.org-20070723182004-6gtqtsa3xka3tn3e
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2007-07-23 20:20:04 +0200
    message:
      Support possible_transports.
    ------------------------------------------------------------
    revno: 220.1.182.1.189
    merged: jelmer at samba.org-20070723183251-tqrmfrnkci07wwc8
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2007-07-23 20:32:51 +0200
    message:
      Try avoiding lots of TCP connections, fix assert.
    ------------------------------------------------------------
    revno: 220.1.182.1.190
    merged: jelmer at samba.org-20070723201826-ewmnm9qct0r56evm
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2007-07-23 22:18:26 +0200
    message:
      Fix some more corner cases with file ids.
    ------------------------------------------------------------
    revno: 220.1.182.1.191
    merged: jelmer at samba.org-20070723232259-r063pn0qyjr64n2n
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2007-07-24 01:22:59 +0200
    message:
      Handle another corner case: a file being removed from a directory that 
      doesn't have any other changes.
    ------------------------------------------------------------
    revno: 220.1.182.1.192
    merged: jelmer at samba.org-20070724032327-airlhmnel9jc3tgw
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2007-07-24 05:23:27 +0200
    message:
      Some more speed optimizations, update credits and todo.
    ------------------------------------------------------------
    revno: 220.1.182.1.193
    merged: jelmer at samba.org-20111214124634-p3zst76knr84mzmm
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Wed 2011-12-14 13:46:34 +0100
    message:
      Remove unused parameter.
    ------------------------------------------------------------
    revno: 220.1.182.1.194
    merged: jelmer at samba.org-20070724203725-jhtqr80e278f4e7s
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2007-07-24 22:37:25 +0200
    message:
      refactor upgrade map generation code.
    ------------------------------------------------------------
    revno: 220.1.182.1.195
    merged: jelmer at samba.org-20070724205959-vehvx3rsk0amhqgm
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2007-07-24 22:59:59 +0200
    message:
      Add more tests for upgrade code.
    ------------------------------------------------------------
    revno: 220.1.182.1.196
    merged: jelmer at samba.org-20070725005621-ck8qht8p26l5ngd5
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Wed 2007-07-25 02:56:21 +0200
    message:
      Split out plan generation code.
    ------------------------------------------------------------
    revno: 220.1.182.1.197
    merged: jelmer at samba.org-20070725012900-igd24qmkqu2lpj35
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Wed 2007-07-25 03:29:00 +0200
    message:
      Add function for upgrading working trees.
    ------------------------------------------------------------
    revno: 220.1.182.1.198
    merged: jelmer at samba.org-20070725235917-t38o96xt2w6lnba6
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Thu 2007-07-26 01:59:17 +0200
    message:
      Match new rebase interface.
    ------------------------------------------------------------
    revno: 220.1.182.1.199
    merged: jelmer at samba.org-20070726195228-al42ip19n3k1cpt8
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Thu 2007-07-26 20:52:28 +0100
    message:
      Mention #128500.
    ------------------------------------------------------------
    revno: 220.1.182.1.200
    merged: jelmer at samba.org-20070726233254-tg1zprjxwpfhfxut
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2007-07-27 00:32:54 +0100
    message:
      Add another test, update docs.
    ------------------------------------------------------------
    revno: 220.1.182.1.201
    merged: jelmer at samba.org-20070727111824-wnyzsuwiowm12553
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2007-07-27 12:18:24 +0100
    message:
      Support possible_transports for checkouts as well.
    ------------------------------------------------------------
    revno: 220.1.182.1.202
    merged: jelmer at samba.org-20070730220401-3s3kwuhq6r38hnlu
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2007-07-30 23:04:01 +0100
    message:
      Add function for setting the branching scheme of a repository.
    ------------------------------------------------------------
    revno: 220.1.182.1.203
    merged: jelmer at samba.org-20070730230741-h8g3zqjgbkd1pjnp
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2007-07-31 00:07:41 +0100
    message:
      Add svn-branching-scheme command.
    ------------------------------------------------------------
    revno: 220.1.182.1.204
    merged: jelmer at samba.org-20070731234134-9znb2q0b7t1pq3hn
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Wed 2007-08-01 00:41:34 +0100
    message:
      Allow changing branching scheme using svn-branching-scheme command.
    ------------------------------------------------------------
    revno: 220.1.182.1.205
    merged: jelmer at samba.org-20070801002337-9ypzaf1i18rpjn9z
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Wed 2007-08-01 01:23:37 +0100
    message:
      Make ListBranchingScheme reconstructable from string.
    ------------------------------------------------------------
    revno: 220.1.182.1.206
    merged: jelmer at samba.org-20070801003608-h8vnssok487kjpm3
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Wed 2007-08-01 01:36:08 +0100
    message:
      Handle some corner cases.
    ------------------------------------------------------------
    revno: 220.1.182.1.207
    merged: jelmer at samba.org-20070801003812-t0mq7wrrzrhzr0fa
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Wed 2007-08-01 01:38:12 +0100
    message:
      Update NEWS.
    ------------------------------------------------------------
    revno: 220.1.182.1.208
    merged: jelmer at samba.org-20070802191823-yss3fdvqmzar78gc
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Thu 2007-08-02 20:18:23 +0100
    message:
      Avoid copying lists for reverse where possible.
    ------------------------------------------------------------
    revno: 220.1.182.1.209
    merged: jelmer at samba.org-20070803133737-94lyf8f2g9p0rqj3
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2007-08-03 15:37:37 +0200
    message:
      Avoid heisenbugs.
    ------------------------------------------------------------
    revno: 220.1.182.1.210
    merged: jelmer at samba.org-20070803133836-0l3zn9pf3gabdyzo
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2007-08-03 15:38:36 +0200
    message:
      Convert more errors in transport.
    ------------------------------------------------------------
    revno: 220.1.182.1.211
    merged: jelmer at samba.org-20070803133920-09um32ry0261b0fc
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2007-08-03 15:39:20 +0200
    message:
      get_transaction() should never be used - make sure that's the case.
    ------------------------------------------------------------
    revno: 220.1.182.1.212
    merged: jelmer at samba.org-20070803134245-hixbfxf9613gxmlq
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2007-08-03 15:42:45 +0200
    message:
      Don't warn about older, deprecated, properties.
    ------------------------------------------------------------
    revno: 220.1.182.1.213
    merged: jelmer at samba.org-20070803135224-1almzm42myulia0p
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2007-08-03 15:52:24 +0200
    message:
      Use standard branching schemes when possible.
    ------------------------------------------------------------
    revno: 220.1.182.1.214
    merged: jelmer at samba.org-20070803153707-sg96nuj8kntt7t6x
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2007-08-03 17:37:07 +0200
    message:
      Mutter only when requested.
    ------------------------------------------------------------
    revno: 220.1.182.1.215
    merged: jelmer at samba.org-20070803162509-41qrc9wtze31n4sc
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2007-08-03 18:25:09 +0200
    message:
      Add validate option to push.
    ------------------------------------------------------------
    revno: 220.1.182.1.216
    merged: jelmer at samba.org-20070803163223-98gp7rxxpbjt9i6p
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2007-08-03 18:32:23 +0200
    message:
      Allow changing branch path of a SvnBranch.
    ------------------------------------------------------------
    revno: 220.1.182.1.217
    merged: jelmer at samba.org-20070803191025-rg6tmh3oqvfgsxay
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2007-08-03 21:10:25 +0200
    message:
      Make sure paths in file id maps are unquoted properly.
    ------------------------------------------------------------
    revno: 220.1.182.1.218
    merged: jelmer at samba.org-20070803194519-5gfnf168fwxlbwx4
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2007-08-03 21:45:19 +0200
    message:
      Make sure root ids are tracked correctly when creating new branches.
    ------------------------------------------------------------
    revno: 220.1.182.1.219
    merged: jelmer at samba.org-20070804001505-gayyla7kljopxfc9
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sat 2007-08-04 02:15:05 +0200
    message:
      Fix issues deleting the wrong file during commit.
    ------------------------------------------------------------
    revno: 220.1.182.1.220
    merged: jelmer at samba.org-20070804013155-a17m4uv8pg4oo3yv
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sat 2007-08-04 03:31:55 +0200
    message:
      Update NEWS.
    ------------------------------------------------------------
    revno: 220.1.182.1.221
    merged: jelmer at samba.org-20070804133921-95duso5lqbc0tiem
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sat 2007-08-04 15:39:21 +0200
    message:
      Don't require svn-push to be run in the root of the branch.
    ------------------------------------------------------------
    revno: 220.1.182.1.222
    merged: jelmer at samba.org-20070804174250-1qmmlnpsh0rnfccu
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sat 2007-08-04 19:42:50 +0200
    message:
      Add some extra assertions.
    ------------------------------------------------------------
    revno: 220.1.182.1.223
    merged: jelmer at samba.org-20070804174515-dkfuh6oje2vw2xpa
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sat 2007-08-04 19:45:15 +0200
    message:
      Special case empty diffs when adding files (#113667).
    ------------------------------------------------------------
    revno: 220.1.182.1.224
    merged: jelmer at samba.org-20070804181159-z1m995l34omvyx69
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sat 2007-08-04 20:11:59 +0200
    message:
      Properly close directory.
    ------------------------------------------------------------
    revno: 220.1.182.1.225
    merged: jelmer at samba.org-20070804181645-nutn08bjslnbtguk
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sat 2007-08-04 20:16:45 +0200
    message:
      Release 0.4.0
-------------- next part --------------
Diff too large for email (16461 lines, the limit is 1000).


More information about the Pkg-bazaar-commits mailing list