Rev 2488: [merge] bzr.dev 2501 in http://bzr.arbash-meinel.com/branches/bzr/0.17-dev/log_short_merges_83887

John Arbash Meinel john at arbash-meinel.com
Fri Jun 1 22:41:01 BST 2007


At http://bzr.arbash-meinel.com/branches/bzr/0.17-dev/log_short_merges_83887

------------------------------------------------------------
revno: 2488
revision-id: john at arbash-meinel.com-20070601214045-zalht5mx39yg11l6
parent: john at arbash-meinel.com-20070508220459-wvpmol3nkg91j5e6
parent: pqm at pqm.ubuntu.com-20070601212622-4hy742yfww9270dw
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: log_short_merges_83887
timestamp: Fri 2007-06-01 16:40:45 -0500
message:
  [merge] bzr.dev 2501
added:
  bzrlib/branchbuilder.py        branchbuilder.py-20070427022007-zlxpqz2lannhk6y8-1
  bzrlib/counted_lock.py         counted_lock.py-20070502135927-7dk86io3ok7ctx6k-1
  bzrlib/tests/test_branchbuilder.py test_branchbuilder.p-20070427022007-zlxpqz2lannhk6y8-2
  bzrlib/tests/test_counted_lock.py test_counted_lock.py-20070502135927-7dk86io3ok7ctx6k-2
  doc/developers/                docdevelopers-20070507164002-62r0es2b29myxges-1
  doc/developers/bundle-creation.rst bundlecreation.rst-20070527173558-rqaqxn1al7vzgcto-1
  doc/developers/incremental-push-pull.txt incrementalpushpull.-20070508045640-zneiu1yzbci574c6-1
  doc/developers/index.txt       index.txt-20070508041241-qznziunkg0nffhiw-1
  doc/developers/initial-push-pull.rst initialpushpull.rst-20070527184539-wodba32mi5dehhct-1
  doc/developers/merge-scaling.rst mergescaling.rst-20070527173558-rqaqxn1al7vzgcto-2
  doc/developers/performance-roadmap-rationale.txt performanceroadmapra-20070507174912-mwv3xv517cs4sisd-1
  doc/developers/performance-roadmap.txt performanceroadmap.t-20070507174912-mwv3xv517cs4sisd-2
  doc/developers/performance-use-case-analysis.txt performanceusecasean-20070508045640-zneiu1yzbci574c6-2
  doc/developers/performance.dot performance.dot-20070527173558-rqaqxn1al7vzgcto-3
renamed:
  HACKING => doc/developers/HACKING HACKING-20050805200004-2a5dc975d870f78c
modified:
  .bzrignore                     bzrignore-20050311232317-81f7b71efa2db11a
  Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
  bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/help_topics.py          help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
  bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
  bzrlib/missing.py              missing.py-20050812153334-097f7097e2a8bcd1
  bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
  bzrlib/tests/HTTPTestUtil.py   HTTPTestUtil.py-20050914180604-247d3aafb7a43343
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
  bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
  bzrlib/tests/test_ancestry.py  test_ancestry.py-20050913023709-69768e94848312c6
  bzrlib/tests/test_commit.py    test_commit.py-20050914060732-279f057f8c295434
  bzrlib/tests/test_dirstate.py  test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
  bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
  bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
  bzrlib/tests/test_missing.py   test_missing.py-20051212000028-694fa4f658a81f48
  bzrlib/tests/test_revert.py    test_revert.py-20060828180832-fqb1v6ecpyvnlitj-1
  bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
  bzrlib/tests/test_treebuilder.py test_treebuilder.py-20060907214856-4omn6hf1u7fvrart-2
  bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
  bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
  bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
  bzrlib/ui/__init__.py          ui.py-20050824083933-8cf663c763ba53a9
  bzrlib/version.py              version.py-20060816024207-ves6ult9a11taj9t-1
  bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
  doc/index.txt                  index.txt-20060622101119-tgwtdci8z769bjb9-2
  doc/shared_repository_layouts.txt shared_repository_la-20070502152030-bagewuqs18ns24o7-1
  doc/tutorial.txt               tutorial.txt-20050804190939-9dcbba2ef053bc84
  setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
  doc/developers/HACKING         HACKING-20050805200004-2a5dc975d870f78c
    ------------------------------------------------------------
    revno: 2483.1.18
    revision-id: pqm at pqm.ubuntu.com-20070601212622-4hy742yfww9270dw
    parent: pqm at pqm.ubuntu.com-20070601195039-ew4306n3v38agaoq
    parent: john at arbash-meinel.com-20070601193523-n91zctoxflcm88h9
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2007-06-01 22:26:22 +0100
    message:
      (Matthew Fuller) Updates to the tutorial
        ------------------------------------------------------------
        revno: 2483.1.16.2.1
        revision-id: john at arbash-meinel.com-20070601193523-n91zctoxflcm88h9
        parent: pqm at pqm.ubuntu.com-20070531210833-8ptk86ocu822hjd5
        parent: fullermd at over-yonder.net-20070530145253-hvlcypma2jhexcvk
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Fri 2007-06-01 14:35:23 -0500
        message:
          (Matthew Fuller) Updates to the tutorial
        ------------------------------------------------------------
        revno: 2483.1.12.4.9
        revision-id: fullermd at over-yonder.net-20070530145253-hvlcypma2jhexcvk
        parent: fullermd at over-yonder.net-20070530035512-5wygby6ekqi9uxc2
        committer: Matthew Fuller <fullermd at over-yonder.net>
        branch nick: tutorial-updates
        timestamp: Wed 2007-05-30 09:52:53 -0500
        message:
          Don't point people at the nonexistent 'status --all'.
        ------------------------------------------------------------
        revno: 2483.1.12.4.8
        revision-id: fullermd at over-yonder.net-20070530035512-5wygby6ekqi9uxc2
        parent: fullermd at over-yonder.net-20070530035408-mpzp6fj1cp3k4c70
        committer: Matthew Fuller <fullermd at over-yonder.net>
        branch nick: tutorial-updates
        timestamp: Tue 2007-05-29 22:55:12 -0500
        message:
          Bump document version from 0.8 to 0.16.
        ------------------------------------------------------------
        revno: 2483.1.12.4.7
        revision-id: fullermd at over-yonder.net-20070530035408-mpzp6fj1cp3k4c70
        parent: fullermd at over-yonder.net-20070530034609-o0yzwdqtu8fpj468
        committer: Matthew Fuller <fullermd at over-yonder.net>
        branch nick: tutorial-updates
        timestamp: Tue 2007-05-29 22:54:08 -0500
        message:
          De-emphasize the heck out of manually rsync'ing for 'push', and
          emphasize the builtin 'push'.
        ------------------------------------------------------------
        revno: 2483.1.12.4.6
        revision-id: fullermd at over-yonder.net-20070530034609-o0yzwdqtu8fpj468
        parent: fullermd at over-yonder.net-20070530034330-iog9fm92mph4zyy9
        committer: Matthew Fuller <fullermd at over-yonder.net>
        branch nick: tutorial-updates
        timestamp: Tue 2007-05-29 22:46:09 -0500
        message:
          Reorganize some text to emphasize 'bzr branch' over grabbing a tarball
          or rsync'ing.
        ------------------------------------------------------------
        revno: 2483.1.12.4.5
        revision-id: fullermd at over-yonder.net-20070530034330-iog9fm92mph4zyy9
        parent: fullermd at over-yonder.net-20070530033244-r70yfpy0rbswxnt9
        committer: Matthew Fuller <fullermd at over-yonder.net>
        branch nick: tutorial-updates
        timestamp: Tue 2007-05-29 22:43:30 -0500
        message:
          Another place where we need to clarify that 'rm' may or may not delete
          the file.
        ------------------------------------------------------------
        revno: 2483.1.12.4.4
        revision-id: fullermd at over-yonder.net-20070530033244-r70yfpy0rbswxnt9
        parent: fullermd at over-yonder.net-20070530032834-bp98yu8tjheuvdpy
        committer: Matthew Fuller <fullermd at over-yonder.net>
        branch nick: tutorial-updates
        timestamp: Tue 2007-05-29 22:32:44 -0500
        message:
          Adjust diff output to look like diff output looks.
        ------------------------------------------------------------
        revno: 2483.1.12.4.3
        revision-id: fullermd at over-yonder.net-20070530032834-bp98yu8tjheuvdpy
        parent: fullermd at over-yonder.net-20070530032249-tww05uv09iomg7sw
        committer: Matthew Fuller <fullermd at over-yonder.net>
        branch nick: tutorial-updates
        timestamp: Tue 2007-05-29 22:28:34 -0500
        message:
          X-ref "Publishing your branch" section from the discussion of branch
          locations.  A question was posed on IRC suggesting a need for this.
        ------------------------------------------------------------
        revno: 2483.1.12.4.2
        revision-id: fullermd at over-yonder.net-20070530032249-tww05uv09iomg7sw
        parent: fullermd at over-yonder.net-20070530031550-fipr8tf74ni89fyg
        committer: Matthew Fuller <fullermd at over-yonder.net>
        branch nick: tutorial-updates
        timestamp: Tue 2007-05-29 22:22:49 -0500
        message:
          rm does sometimes remove the file now.  Try and make that a little
          more correct, without being hopelessly complicated.
        ------------------------------------------------------------
        revno: 2483.1.12.4.1
        revision-id: fullermd at over-yonder.net-20070530031550-fipr8tf74ni89fyg
        parent: pqm at pqm.ubuntu.com-20070525050023-ip6kst9coq8a32z5
        committer: Matthew Fuller <fullermd at over-yonder.net>
        branch nick: tutorial-updates
        timestamp: Tue 2007-05-29 22:15:50 -0500
        message:
          Get rid of references to 'bzr unknowns'.
    ------------------------------------------------------------
    revno: 2483.1.17
    revision-id: pqm at pqm.ubuntu.com-20070601195039-ew4306n3v38agaoq
    parent: pqm at pqm.ubuntu.com-20070531210833-8ptk86ocu822hjd5
    parent: aaron.bentley at utoronto.ca-20070601054311-15wtrjil1onbuea3
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2007-06-01 20:50:39 +0100
    message:
      Revert does not try to preserve file contents produced by revert
        ------------------------------------------------------------
        revno: 2483.1.16.1.1
        revision-id: aaron.bentley at utoronto.ca-20070601054311-15wtrjil1onbuea3
        parent: pqm at pqm.ubuntu.com-20070531210833-8ptk86ocu822hjd5
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: bzr.ab2
        timestamp: Fri 2007-06-01 01:43:11 -0400
        message:
          Revert does not try to preserve file contents produced by revert
    ------------------------------------------------------------
    revno: 2483.1.16
    revision-id: pqm at pqm.ubuntu.com-20070531210833-8ptk86ocu822hjd5
    parent: pqm at pqm.ubuntu.com-20070530152720-qdjd3zs950nindfs
    parent: john at arbash-meinel.com-20070531202904-34h7ygudo7qq9ha1
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-05-31 22:08:33 +0100
    message:
      (John Arbash Meinel, r=robert) Tweak _iter_changes and update_entry to make bzr status and bzr diff much faster
        ------------------------------------------------------------
        revno: 2483.1.2.3.14
        revision-id: john at arbash-meinel.com-20070531202904-34h7ygudo7qq9ha1
        parent: john at arbash-meinel.com-20070531141758-i5f7gqddjm497ij8
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate_optim_2
        timestamp: Thu 2007-05-31 15:29:04 -0500
        message:
          Update the code so that symlinks aren't cached at incorrect times
          and fix the tests so that they don't assume files and symlinks
          get cached even when the timestamp doesn't declare them 'safe'.
        ------------------------------------------------------------
        revno: 2483.1.2.3.13
        revision-id: john at arbash-meinel.com-20070531141758-i5f7gqddjm497ij8
        parent: john at arbash-meinel.com-20070517182306-dhc0cf38l5fhv2dj
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate_optim_2
        timestamp: Thu 2007-05-31 09:17:58 -0500
        message:
          NEWS
        ------------------------------------------------------------
        revno: 2483.1.2.3.12
        revision-id: john at arbash-meinel.com-20070517182306-dhc0cf38l5fhv2dj
        parent: john at arbash-meinel.com-20070517182243-3844dyynbautwcwu
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate_optim_2
        timestamp: Thu 2007-05-17 19:23:06 +0100
        message:
          Delay joining the path until we are actually going to be using it.
        ------------------------------------------------------------
        revno: 2483.1.2.3.11
        revision-id: john at arbash-meinel.com-20070517182243-3844dyynbautwcwu
        parent: john at arbash-meinel.com-20070517175221-edsgtdww5ogxhmqv
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate_optim_2
        timestamp: Thu 2007-05-17 19:22:43 +0100
        message:
          Correct DirState.update_entry to check when caching the sha1
          not when returning it.
        ------------------------------------------------------------
        revno: 2483.1.2.3.10
        revision-id: john at arbash-meinel.com-20070517175221-edsgtdww5ogxhmqv
        parent: john at arbash-meinel.com-20070517171133-l0rfa3x4j2zef8jf
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate_optim_2
        timestamp: Thu 2007-05-17 18:52:21 +0100
        message:
          Remove some extra comments.
        ------------------------------------------------------------
        revno: 2483.1.2.3.9
        revision-id: john at arbash-meinel.com-20070517171133-l0rfa3x4j2zef8jf
        parent: john at arbash-meinel.com-20070517170734-munw3o4jwwey6jpe
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate_optim_2
        timestamp: Thu 2007-05-17 18:11:33 +0100
        message:
          Now that we know when tuples will be yielded
          go ahead and spend the effort to make them *nice* tuples.
        ------------------------------------------------------------
        revno: 2483.1.2.3.8
        revision-id: john at arbash-meinel.com-20070517170734-munw3o4jwwey6jpe
        parent: john at arbash-meinel.com-20070516062651-rb6kuunel56yh0dj
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate_optim_2
        timestamp: Thu 2007-05-17 18:07:34 +0100
        message:
          Keep track of directories that you have seen.
          Only fall back to _get_entry if that misses.
        ------------------------------------------------------------
        revno: 2483.1.2.3.7
        revision-id: john at arbash-meinel.com-20070516062651-rb6kuunel56yh0dj
        parent: john at arbash-meinel.com-20070516061855-zj7l63ffzw822ztg
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate_optim_1
        timestamp: Wed 2007-05-16 07:26:51 +0100
        message:
          Comment on some alternative 'pack_stat'
        ------------------------------------------------------------
        revno: 2483.1.2.3.6
        revision-id: john at arbash-meinel.com-20070516061855-zj7l63ffzw822ztg
        parent: john at arbash-meinel.com-20070516055758-4qmxk53j07k6lnzz
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate_optim_1
        timestamp: Wed 2007-05-16 07:18:55 +0100
        message:
          Delay calling pathjoin() until we've figured out we're going to use it
          (this is only a small win)
        ------------------------------------------------------------
        revno: 2483.1.2.3.5
        revision-id: john at arbash-meinel.com-20070516055758-4qmxk53j07k6lnzz
        parent: john at arbash-meinel.com-20070516054627-kv3otbqzd1bi22yx
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate_optim_1
        timestamp: Wed 2007-05-16 06:57:58 +0100
        message:
          switching to a single returned object from _process_entry is not faster
          using result = _process_entry, if result is not ... is not strictly
          faster than for result in _process_entry. I'm not sure why.
          I think it is a little cleaner, though.
        ------------------------------------------------------------
        revno: 2483.1.2.3.4
        revision-id: john at arbash-meinel.com-20070516054627-kv3otbqzd1bi22yx
        parent: john at arbash-meinel.com-20070515232720-4alrtd5q4p4m3q1r
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate_optim_1
        timestamp: Wed 2007-05-16 06:46:27 +0100
        message:
          Change _process_entry to detect when we don't care about something.
          This lets us do the standard check on local variables
          and handles the *very* common case of nothing being changed.
        ------------------------------------------------------------
        revno: 2483.1.2.3.3
        revision-id: john at arbash-meinel.com-20070515232720-4alrtd5q4p4m3q1r
        parent: john at arbash-meinel.com-20070515224039-h6arou8igzv9k34l
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate_optim_1
        timestamp: Wed 2007-05-16 00:27:20 +0100
        message:
          Avoid extra work in inner 'DirState.update_entry' code.
          Use local vars for most functinos, directly lookup in local dict rather
          than going through osutils.stat_to_file_kind.
          Require the stat to be passed in, rather than being optional.
          change pack_stat to use binascii.b2a_base64 (the underlying function)
          Move pack_stat to top of code, so it can be saved as local variable.
          This cuts the time spent in update_entry to 1/2.
          Avoiding pack_stat is also a potentially large win. (5% or so)
        ------------------------------------------------------------
        revno: 2483.1.2.3.2
        revision-id: john at arbash-meinel.com-20070515224039-h6arou8igzv9k34l
        parent: john at arbash-meinel.com-20070515221632-xphatel2dqh29ya7
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate_optim_1
        timestamp: Tue 2007-05-15 23:40:39 +0100
        message:
          Handle the case when getfilesystemencoding() is lowercase.
        ------------------------------------------------------------
        revno: 2483.1.2.3.1
        revision-id: john at arbash-meinel.com-20070515221632-xphatel2dqh29ya7
        parent: pqm at pqm.ubuntu.com-20070510055501-w262sk5hl33vmd19
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate_optim_1
        timestamp: Tue 2007-05-15 23:16:32 +0100
        message:
          Fix DirState handling of dir records.
          We were comparing stat_value.st_size against the recorded directory size
          which is always 0.
    ------------------------------------------------------------
    revno: 2483.1.15
    revision-id: pqm at pqm.ubuntu.com-20070530152720-qdjd3zs950nindfs
    parent: pqm at pqm.ubuntu.com-20070527193804-znv53vjd04u6es6x
    parent: john at arbash-meinel.com-20070530124825-5bnsdms150iy8q0b
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2007-05-30 16:27:20 +0100
    message:
      (Robert Collins) Add a BranchBuilder API for use by the test suite.
        ------------------------------------------------------------
        revno: 2483.1.12.3.2
        revision-id: john at arbash-meinel.com-20070530124825-5bnsdms150iy8q0b
        parent: john at arbash-meinel.com-20070530124523-gxsp1617s70fhwqc
        parent: robertc at robertcollins.net-20070427034250-8gie8hxmx3e2cgc3
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Wed 2007-05-30 07:48:25 -0500
        message:
          (Robert Collins) Use BranchBuilder in test_ancestry.
            ------------------------------------------------------------
            revno: 2466.7.9.1.1
            revision-id: robertc at robertcollins.net-20070427034250-8gie8hxmx3e2cgc3
            parent: robertc at robertcollins.net-20070427033909-bsuz8ogd7r75dbfl
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: use-build-branch
            timestamp: Fri 2007-04-27 13:42:50 +1000
            message:
              Use BranchBuilder in test_ancestry.
        ------------------------------------------------------------
        revno: 2483.1.12.3.1
        revision-id: john at arbash-meinel.com-20070530124523-gxsp1617s70fhwqc
        parent: pqm at pqm.ubuntu.com-20070525050023-ip6kst9coq8a32z5
        parent: robertc at robertcollins.net-20070427061629-hqnq6rocm9dgljhx
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Wed 2007-05-30 07:45:23 -0500
        message:
          (Robert Collins) Add a BranchBuilder API for use by the test suite.
        ------------------------------------------------------------
        revno: 2466.7.10
        revision-id: robertc at robertcollins.net-20070427061629-hqnq6rocm9dgljhx
        parent: robertc at robertcollins.net-20070427033909-bsuz8ogd7r75dbfl
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: build-branch
        timestamp: Fri 2007-04-27 16:16:29 +1000
        message:
          Add a format parameter to BranchBuilder.
        ------------------------------------------------------------
        revno: 2466.7.9
        revision-id: robertc at robertcollins.net-20070427033909-bsuz8ogd7r75dbfl
        parent: robertc at robertcollins.net-20070427031822-1ga7jck9yw5ivsfr
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: build-branch
        timestamp: Fri 2007-04-27 13:39:09 +1000
        message:
          Return the commited revision id from BranchBuilder.build_commit to save later instrospection.
        ------------------------------------------------------------
        revno: 2466.7.8
        revision-id: robertc at robertcollins.net-20070427031822-1ga7jck9yw5ivsfr
        parent: robertc at robertcollins.net-20070427031300-wqxk6eo04pxn6trg
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: build-branch
        timestamp: Fri 2007-04-27 13:18:22 +1000
        message:
          NEWS too.
        ------------------------------------------------------------
        revno: 2466.7.7
        revision-id: robertc at robertcollins.net-20070427031300-wqxk6eo04pxn6trg
        parent: robertc at robertcollins.net-20070427030205-ll4s3d57mf0dcaqk
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: build-branch
        timestamp: Fri 2007-04-27 13:13:00 +1000
        message:
          Document basic usage.
        ------------------------------------------------------------
        revno: 2466.7.6
        revision-id: robertc at robertcollins.net-20070427030205-ll4s3d57mf0dcaqk
        parent: robertc at robertcollins.net-20070427023229-0a72vfyt4forz2c5
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: build-branch
        timestamp: Fri 2007-04-27 13:02:05 +1000
        message:
          Add BranchBuilder.build_commit.
        ------------------------------------------------------------
        revno: 2466.7.5
        revision-id: robertc at robertcollins.net-20070427023229-0a72vfyt4forz2c5
        parent: robertc at robertcollins.net-20070427023143-na837vjyw8y7ulns
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: build-branch
        timestamp: Fri 2007-04-27 12:32:29 +1000
        message:
          Better docstring for BranchBuilder.__init__.
        ------------------------------------------------------------
        revno: 2466.7.4
        revision-id: robertc at robertcollins.net-20070427023143-na837vjyw8y7ulns
        parent: robertc at robertcollins.net-20070427022014-gw8g0qi639fquuba
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: build-branch
        timestamp: Fri 2007-04-27 12:31:43 +1000
        message:
          Add BranchBuilder.get_branch().
        ------------------------------------------------------------
        revno: 2466.7.3
        revision-id: robertc at robertcollins.net-20070427022014-gw8g0qi639fquuba
        parent: robertc at robertcollins.net-20070427003620-6fjf8dbiblgt5am7
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: build-branch
        timestamp: Fri 2007-04-27 12:20:14 +1000
        message:
          Create bzrlib.branchbuilder.
    ------------------------------------------------------------
    revno: 2483.1.14
    revision-id: pqm at pqm.ubuntu.com-20070527193804-znv53vjd04u6es6x
    parent: pqm at pqm.ubuntu.com-20070526160035-utugnd3he5zvo60s
    parent: aaron.bentley at utoronto.ca-20070527184754-p0w83p0v54ejks8s
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sun 2007-05-27 20:38:04 +0100
    message:
      Add performance analysis docs
        ------------------------------------------------------------
        revno: 2483.1.12.2.2
        revision-id: aaron.bentley at utoronto.ca-20070527184754-p0w83p0v54ejks8s
        parent: aaron.bentley at utoronto.ca-20070527174550-3su5c5701pi9vv1y
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: bzr.docs
        timestamp: Sun 2007-05-27 14:47:54 -0400
        message:
          Add initial push/pull analysis
        ------------------------------------------------------------
        revno: 2483.1.12.2.1
        revision-id: aaron.bentley at utoronto.ca-20070527174550-3su5c5701pi9vv1y
        parent: pqm at pqm.ubuntu.com-20070525050023-ip6kst9coq8a32z5
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: bzr.docs
        timestamp: Sun 2007-05-27 13:45:50 -0400
        message:
          Add bundle creation and merge scaling analysis
    ------------------------------------------------------------
    revno: 2483.1.13
    revision-id: pqm at pqm.ubuntu.com-20070526160035-utugnd3he5zvo60s
    parent: pqm at pqm.ubuntu.com-20070525050023-ip6kst9coq8a32z5
    parent: aaron.bentley at utoronto.ca-20070526153055-gdl80ttx0j7wwwmu
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sat 2007-05-26 17:00:35 +0100
    message:
      Fix PyCurl single-range bug (Vincent Ladeuil, #112719)
        ------------------------------------------------------------
        revno: 2483.1.12.1.1
        revision-id: aaron.bentley at utoronto.ca-20070526153055-gdl80ttx0j7wwwmu
        parent: pqm at pqm.ubuntu.com-20070525050023-ip6kst9coq8a32z5
        parent: v.ladeuil+lp at free.fr-20070506065957-4jdlek9i5at2qb36
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: bzr.ab.integration
        timestamp: Sat 2007-05-26 11:30:55 -0400
        message:
          Merge PyCurl single-range bug
        ------------------------------------------------------------
        revno: 2481.3.1
        revision-id: v.ladeuil+lp at free.fr-20070506065957-4jdlek9i5at2qb36
        parent: pqm at pqm.ubuntu.com-20070504034556-wzcw478l7qkppkq0
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: 112719
        timestamp: Sun 2007-05-06 08:59:57 +0200
        message:
          Fix bug #112719 by using the right range header.
          
          * HTTPTestUtil.py:
          (SingleOnlyRangeRequestHandler): Noisily refuses mutliple range
          requests.
          
          * test_http.py:
          (TestSingleOnlyRangeRequestServer): Test the retry mechanism when
          a server refuses to handle a mutiple range request without
          silently replying with a single range or full file response.
          
          * _pycurl.py:
          (PyCurlTransport._get_ranged): The header have been built taken
          into account the range hint, don't rebuilt it *ignoring* that
          hint.
    ------------------------------------------------------------
    revno: 2483.1.12
    revision-id: pqm at pqm.ubuntu.com-20070525050023-ip6kst9coq8a32z5
    parent: pqm at pqm.ubuntu.com-20070525043332-aw7j04dvjy6ua1v9
    parent: bialix at ukr.net-20070504110241-bgormskp9ihlft2r
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2007-05-25 06:00:23 +0100
    message:
      (bialix,r=john) don't bundle into standalone bzr.exe site.py (with
       their depends), and tools/doc_generate
        ------------------------------------------------------------
        revno: 2481.2.1
        revision-id: bialix at ukr.net-20070504110241-bgormskp9ihlft2r
        parent: pqm at pqm.ubuntu.com-20070504034556-wzcw478l7qkppkq0
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: installer
        timestamp: Fri 2007-05-04 14:02:41 +0300
        message:
          don't bundle into standalone bzr.exe site.py (with their depends), and tools/doc_generate
    ------------------------------------------------------------
    revno: 2483.1.11
    revision-id: pqm at pqm.ubuntu.com-20070525043332-aw7j04dvjy6ua1v9
    parent: pqm at pqm.ubuntu.com-20070524165738-rzs9lvgoqk20vls9
    parent: aaron.bentley at utoronto.ca-20070525040047-w4ymt5gvi3gecx1g
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2007-05-25 05:33:32 +0100
    message:
      Merge log --limit (Kent Gibson)
        ------------------------------------------------------------
        revno: 2483.1.10.1.1
        revision-id: aaron.bentley at utoronto.ca-20070525040047-w4ymt5gvi3gecx1g
        parent: pqm at pqm.ubuntu.com-20070524165738-rzs9lvgoqk20vls9
        parent: warthog618 at gmail.com-20070505023239-2yrekc2wwgkpu6br
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: bzr.ab.integration
        timestamp: Fri 2007-05-25 00:00:47 -0400
        message:
          Merge log --limit (Kent Gibson)
        ------------------------------------------------------------
        revno: 2466.8.1.1.1
        revision-id: warthog618 at gmail.com-20070505023239-2yrekc2wwgkpu6br
        parent: warthog618 at gmail.com-20070429034630-p3xbitz2xyl6pbie
        committer: Kent Gibson <warthog618 at gmail.com>
        branch nick: log_limit
        timestamp: Sat 2007-05-05 10:32:39 +0800
        message:
          add bzr log --limit
    ------------------------------------------------------------
    revno: 2483.1.10
    revision-id: pqm at pqm.ubuntu.com-20070524165738-rzs9lvgoqk20vls9
    parent: pqm at pqm.ubuntu.com-20070524160700-3mu8f24yc5ej88m1
    parent: john at arbash-meinel.com-20070524161253-rhy5ajcwxxfqk3sr
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-05-24 17:57:38 +0100
    message:
      (Marien Zwart) Update test_selftest.test_elapsed_time_with... to be more forgiving
        ------------------------------------------------------------
        revno: 2483.1.9.1.2
        revision-id: john at arbash-meinel.com-20070524161253-rhy5ajcwxxfqk3sr
        parent: john at arbash-meinel.com-20070524161045-t2dtfewkpnxeqlnp
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Thu 2007-05-24 11:12:53 -0500
        message:
          Tweak the regex a bit more
        ------------------------------------------------------------
        revno: 2483.1.9.1.1
        revision-id: john at arbash-meinel.com-20070524161045-t2dtfewkpnxeqlnp
        parent: pqm at pqm.ubuntu.com-20070524160700-3mu8f24yc5ej88m1
        parent: marienz at gentoo.org-20070511003934-5v54sk8ejgxgghst
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Thu 2007-05-24 11:10:45 -0500
        message:
          [merge] Marien Zwart: make test_elapsed_time more forgiving.
        ------------------------------------------------------------
        revno: 2483.1.2.2.1
        revision-id: marienz at gentoo.org-20070511003934-5v54sk8ejgxgghst
        parent: pqm at pqm.ubuntu.com-20070510055501-w262sk5hl33vmd19
        committer: Marien Zwart <marienz at gentoo.org>
        branch nick: fix-timed-tests
        timestamp: Fri 2007-05-11 02:39:34 +0200
        message:
          Make test_elapsed_time_with_benchmarking pass on a slow cpu.
    ------------------------------------------------------------
    revno: 2483.1.9
    revision-id: pqm at pqm.ubuntu.com-20070524160700-3mu8f24yc5ej88m1
    parent: pqm at pqm.ubuntu.com-20070524130959-7zpl03vgx35bezhf
    parent: john at arbash-meinel.com-20070524152641-2vq63484l18cy4e8
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-05-24 17:07:00 +0100
    message:
      (James Westby) Add a help topic for working trees and repositories.
        ------------------------------------------------------------
        revno: 2483.1.8.1.1
        revision-id: john at arbash-meinel.com-20070524152641-2vq63484l18cy4e8
        parent: pqm at pqm.ubuntu.com-20070524130959-7zpl03vgx35bezhf
        parent: jw+debian at jameswestby.net-20070514204516-6bnkhae4x3cx3z1k
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Thu 2007-05-24 10:26:41 -0500
        message:
          (James Westby) Add a help topic for working trees and repositories.
        ------------------------------------------------------------
        revno: 2483.1.2.1.3
        revision-id: jw+debian at jameswestby.net-20070514204516-6bnkhae4x3cx3z1k
        parent: jw+debian at jameswestby.net-20070514204247-mcxwep2on9g5p30w
        committer: James Westby <jw+debian at jameswestby.net>
        branch nick: bzr.repohelp
        timestamp: Mon 2007-05-14 21:45:16 +0100
        message:
          Add a NEWS entry for the changes.
        ------------------------------------------------------------
        revno: 2483.1.2.1.2
        revision-id: jw+debian at jameswestby.net-20070514204247-mcxwep2on9g5p30w
        parent: jw+debian at jameswestby.net-20070514193026-3itaozap05k3vuxp
        committer: James Westby <jw+debian at jameswestby.net>
        branch nick: bzr.repohelp
        timestamp: Mon 2007-05-14 21:42:47 +0100
        message:
          Update with comments from review, thanks to John and Aaron.
        ------------------------------------------------------------
        revno: 2483.1.2.1.1
        revision-id: jw+debian at jameswestby.net-20070514193026-3itaozap05k3vuxp
        parent: pqm at pqm.ubuntu.com-20070510055501-w262sk5hl33vmd19
        parent: jw+debian at jameswestby.net-20070414025144-qv17v6rkq1tfu6v8
        committer: James Westby <jw+debian at jameswestby.net>
        branch nick: bzr.repohelp
        timestamp: Mon 2007-05-14 20:30:26 +0100
        message:
          Update the help topics to the latest bzr.dev.
        ------------------------------------------------------------
        revno: 2401.2.2
        revision-id: jw+debian at jameswestby.net-20070414025144-qv17v6rkq1tfu6v8
        parent: jw+debian at jameswestby.net-20070414010244-4qvkerl2bztwchn1
        committer: James Westby <jw+debian at jameswestby.net>
        branch nick: bzr.dev.repos
        timestamp: Sat 2007-04-14 03:51:44 +0100
        message:
          Add a working-trees help topic.
          
          Has both some general information and specifics about dealing with remote
          working trees. Because of that change the remote tree warning message to point
          to it. Hopefully that will give users a starting point for deciding how to
          cope with that situation.
        ------------------------------------------------------------
        revno: 2401.2.1
        revision-id: jw+debian at jameswestby.net-20070414010244-4qvkerl2bztwchn1
        parent: pqm at pqm.ubuntu.com-20070405073143-8fa894c829ab5e50
        committer: James Westby <jw+debian at jameswestby.net>
        branch nick: bzr.dev.repos
        timestamp: Sat 2007-04-14 02:02:44 +0100
        message:
          Add a help topic for repositories.
    ------------------------------------------------------------
    revno: 2483.1.8
    revision-id: pqm at pqm.ubuntu.com-20070524130959-7zpl03vgx35bezhf
    parent: pqm at pqm.ubuntu.com-20070523095110-bqaodkh3q7v0fime
    parent: john at arbash-meinel.com-20070524124224-0yyi4laqtngw6lf6
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-05-24 14:09:59 +0100
    message:
      (Kent Gibson) Update the LogFormatter API to use a LogRevision object.
        ------------------------------------------------------------
        revno: 2483.1.7.1.4
        revision-id: john at arbash-meinel.com-20070524124224-0yyi4laqtngw6lf6
        parent: john at arbash-meinel.com-20070524121925-jf60fhqgvtcy6n0g
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Thu 2007-05-24 07:42:24 -0500
        message:
          Update bzrlib.log.show_changed_revisions to use the new api
        ------------------------------------------------------------
        revno: 2483.1.7.1.3
        revision-id: john at arbash-meinel.com-20070524121925-jf60fhqgvtcy6n0g
        parent: john at arbash-meinel.com-20070524121306-jlb942ezpitxujud
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Thu 2007-05-24 07:19:25 -0500
        message:
          Restore the test for iter_log_data as a deprecated function.
        ------------------------------------------------------------
        revno: 2483.1.7.1.2
        revision-id: john at arbash-meinel.com-20070524121306-jlb942ezpitxujud
        parent: john at arbash-meinel.com-20070524115407-lcnak713swd59lvk
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Thu 2007-05-24 07:13:06 -0500
        message:
          Cleanup according to PEP8 and some other small whitespace fixes
        ------------------------------------------------------------
        revno: 2483.1.7.1.1
        revision-id: john at arbash-meinel.com-20070524115407-lcnak713swd59lvk
        parent: pqm at pqm.ubuntu.com-20070523095110-bqaodkh3q7v0fime
        parent: warthog618 at gmail.com-20070507115128-myp6wjqauc85kr4p
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Thu 2007-05-24 06:54:07 -0500
        message:
          [merge] Kent Gibson: Rework LogFormatter API
        ------------------------------------------------------------
        revno: 2466.8.2
        revision-id: warthog618 at gmail.com-20070507115128-myp6wjqauc85kr4p
        parent: warthog618 at gmail.com-20070429034630-p3xbitz2xyl6pbie
        committer: Kent Gibson <warthog618 at gmail.com>
        branch nick: lf_rework
        timestamp: Mon 2007-05-07 19:51:28 +0800
        message:
          Move begin/end calls from _show_log to show_log.  Fix long line.
        ------------------------------------------------------------
        revno: 2466.8.1
        revision-id: warthog618 at gmail.com-20070429034630-p3xbitz2xyl6pbie
        parent: pqm at pqm.ubuntu.com-20070426211103-h84prqh7a4ad3ez2
        committer: Kent Gibson <warthog618 at gmail.com>
        branch nick: bzr.kg
        timestamp: Sun 2007-04-29 11:46:30 +0800
        message:
          Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
          Fixed minor inconsistency between display of revids in mainline and merge revisions in long log format.  Both now labelled "revision-id:" and are only displayed when --show-ids is specified.
    ------------------------------------------------------------
    revno: 2483.1.7
    revision-id: pqm at pqm.ubuntu.com-20070523095110-bqaodkh3q7v0fime
    parent: pqm at pqm.ubuntu.com-20070523092220-d1hkaakjej39827x
    parent: john at arbash-meinel.com-20070523090735-3uf48sdb33qh79g4
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2007-05-23 10:51:10 +0100
    message:
      (Robert Collins) Document TreeBuilder, and do some cleanup.
        ------------------------------------------------------------
        revno: 2483.1.5.1.2
        revision-id: john at arbash-meinel.com-20070523090735-3uf48sdb33qh79g4
        parent: john at arbash-meinel.com-20070523085414-8o53d2txzpn4ni9y
        parent: robertc at robertcollins.net-20070427003620-6fjf8dbiblgt5am7
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Wed 2007-05-23 04:07:35 -0500
        message:
          (Robert Collins) Document TreeBuilder, and do some cleanup.
        ------------------------------------------------------------
        revno: 2466.7.2
        revision-id: robertc at robertcollins.net-20070427003620-6fjf8dbiblgt5am7
        parent: robertc at robertcollins.net-20070427001815-3m1u2fk695um4oyb
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: build-branch
        timestamp: Fri 2007-04-27 10:36:20 +1000
        message:
          Document the user of TreeBuilder somewhat.
        ------------------------------------------------------------
        revno: 2466.7.1
        revision-id: robertc at robertcollins.net-20070427001815-3m1u2fk695um4oyb
        parent: pqm at pqm.ubuntu.com-20070426211103-h84prqh7a4ad3ez2
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: build-branch
        timestamp: Fri 2007-04-27 10:18:15 +1000
        message:
          Tree builder tests do not need a working dir.
    ------------------------------------------------------------
    revno: 2483.1.6
    revision-id: pqm at pqm.ubuntu.com-20070523092220-d1hkaakjej39827x
    parent: pqm at pqm.ubuntu.com-20070521152446-1v1dk0m7c705cdlx
    parent: john at arbash-meinel.com-20070523085414-8o53d2txzpn4ni9y
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2007-05-23 10:22:20 +0100
    message:
      (Vincent Ladeuil) Fix bug #110204 allowing proper password prompt encoding
        ------------------------------------------------------------
        revno: 2483.1.5.1.1
        revision-id: john at arbash-meinel.com-20070523085414-8o53d2txzpn4ni9y
        parent: pqm at pqm.ubuntu.com-20070521152446-1v1dk0m7c705cdlx
        parent: v.ladeuil+lp at free.fr-20070426205243-gwo5c2xhd75tezxz
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Wed 2007-05-23 03:54:14 -0500
        message:
          (Vincent Ladeuil) Fix bug #110204 allowing proper password prompt encoding
        ------------------------------------------------------------
        revno: 2461.1.2
        revision-id: v.ladeuil+lp at free.fr-20070426205243-gwo5c2xhd75tezxz
        parent: v.ladeuil+lp at free.fr-20070426081629-g0rsiqfszpxz2tto
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: 110204
        timestamp: Thu 2007-04-26 22:52:43 +0200
        message:
          Take jam's remark into account.
          
          * bzrlib/ui/__init__.py:
          (CLIUIFactory.get_non_echoed_password): Better to use
          osutils.get_terminal_encoding() !
        ------------------------------------------------------------
        revno: 2461.1.1
        revision-id: v.ladeuil+lp at free.fr-20070426081629-g0rsiqfszpxz2tto
        parent: pqm at pqm.ubuntu.com-20070426070825-6xw10b1el98su02i
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: 110204
        timestamp: Thu 2007-04-26 10:16:29 +0200
        message:
          Fix 110204 by letting TestUIFactory encode password prompt.
          
          * bzrlib/ui/__init__.py:
          (CLIUIFactory.get_non_echoed_password): Encode prompt with
          sys.stdout.
          (CLIUIFactory.get_password): Delegate prompt encoding to
          get_non_echoed_password.
          
          * bzrlib/tests/__init__.py:
          (TestUIFactory.get_non_echoed_password): Encode prompt with
          self.stdout.
    ------------------------------------------------------------
    revno: 2483.1.5
    revision-id: pqm at pqm.ubuntu.com-20070521152446-1v1dk0m7c705cdlx
    parent: pqm at pqm.ubuntu.com-20070517174205-qwgn733pkui2xqr4
    parent: aaron.bentley at utoronto.ca-20070521141436-x3aw0x8tksw2yu0e
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-05-21 16:24:46 +0100
    message:
      Better error for selected-file commit of merges
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.9
        revision-id: aaron.bentley at utoronto.ca-20070521141436-x3aw0x8tksw2yu0e
        parent: aaron.bentley at utoronto.ca-20070521140910-ugock53or9q2ki8g
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: Aaron's mergeable stuff
        timestamp: Mon 2007-05-21 10:14:36 -0400
        message:
          Better error for selected-file commit of merges
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.8
        revision-id: aaron.bentley at utoronto.ca-20070521140910-ugock53or9q2ki8g
        parent: aaron.bentley at utoronto.ca-20070420114824-jd5kfyku8qeyv844
        parent: pqm at pqm.ubuntu.com-20070517174205-qwgn733pkui2xqr4
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: Aaron's mergeable stuff
        timestamp: Mon 2007-05-21 10:09:10 -0400
        message:
          Merge bzr.dev
    ------------------------------------------------------------
    revno: 2483.1.4
    revision-id: pqm at pqm.ubuntu.com-20070517174205-qwgn733pkui2xqr4
    parent: pqm at pqm.ubuntu.com-20070516183055-codor2wzlo96i996
    parent: john at arbash-meinel.com-20070517165510-nua3t85svfqt89x2
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-05-17 18:42:05 +0100
    message:
      (Klaus Hartke) Remove duplicate line in commit.py
        ------------------------------------------------------------
        revno: 2483.1.3.1.1
        revision-id: john at arbash-meinel.com-20070517165510-nua3t85svfqt89x2
        parent: pqm at pqm.ubuntu.com-20070516183055-codor2wzlo96i996
        parent: klaus.hartke at googlemail.com-20070517150749-l1jbjftc4sgoe5lk
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Thu 2007-05-17 17:55:10 +0100
        message:
          (Klaus Hartke) Remove duplicate line in commit.py
        ------------------------------------------------------------
        revno: 2483.1.3.2.1
        revision-id: klaus.hartke at googlemail.com-20070517150749-l1jbjftc4sgoe5lk
        parent: pqm at pqm.ubuntu.com-20070516183055-codor2wzlo96i996
        committer: Klaus Hartke <klaus.hartke at googlemail.com>
        branch nick: bzr.klaus
        timestamp: Thu 2007-05-17 17:07:49 +0200
        message:
          Removed duplicate line.
    ------------------------------------------------------------
    revno: 2483.1.3
    revision-id: pqm at pqm.ubuntu.com-20070516183055-codor2wzlo96i996
    parent: pqm at pqm.ubuntu.com-20070510055501-w262sk5hl33vmd19
    parent: mbp at sourcefrog.net-20070502140053-50hm0ihm249u627n
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2007-05-16 19:30:55 +0100
    message:
      (mbp,r=john) add CountedLock class
        ------------------------------------------------------------
        revno: 2475.4.1
        revision-id: mbp at sourcefrog.net-20070502140053-50hm0ihm249u627n
        parent: pqm at pqm.ubuntu.com-20070501182714-71xp33bziogu3qu0
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: counted-lock
        timestamp: Thu 2007-05-03 00:00:53 +1000
        message:
          Start adding CountedLock class to partially replace LockableFiles
    ------------------------------------------------------------
    revno: 2483.1.2
    revision-id: pqm at pqm.ubuntu.com-20070510055501-w262sk5hl33vmd19
    parent: pqm at pqm.ubuntu.com-20070508203256-wcxwdphd1y2psezh
    parent: robertc at robertcollins.net-20070509153606-m556z2rb3d76b2f3
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-05-10 06:55:01 +0100
    message:
      (robertc) Move HACKING to doc/developers/HACKING and start on performance analysis documentation. (Robert Collins)
    ------------------------------------------------------------
    revno: 2481.1.5
    revision-id: robertc at robertcollins.net-20070509153606-m556z2rb3d76b2f3
    parent: robertc at robertcollins.net-20070508041401-rreosr07ptz41d6c
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: roadmap
    timestamp: Thu 2007-05-10 01:36:06 +1000
    message:
      Incremental push-pull performance anlysis draft.
    ------------------------------------------------------------
    revno: 2481.1.4
    revision-id: robertc at robertcollins.net-20070508041401-rreosr07ptz41d6c
    parent: robertc at robertcollins.net-20070507174930-gksqv90l5emjrcyq
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: roadmap
    timestamp: Tue 2007-05-08 14:14:01 +1000
    message:
      Fix the developer documentation to use the right style sheet and give it its own index. (Robert Collins, Alexander Belchenko)
    ------------------------------------------------------------
    revno: 2481.1.3
    revision-id: robertc at robertcollins.net-20070507174930-gksqv90l5emjrcyq
    parent: robertc at robertcollins.net-20070507170412-91hbpdaem8bvel4s
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: roadmap
    timestamp: Tue 2007-05-08 03:49:30 +1000
    message:
      Add the performance roadmap rationale.
    ------------------------------------------------------------
    revno: 2481.1.2
    revision-id: robertc at robertcollins.net-20070507170412-91hbpdaem8bvel4s
    parent: robertc at robertcollins.net-20070507164814-wpagonutf4b5cf8s
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: roadmap
    timestamp: Tue 2007-05-08 03:04:12 +1000
    message:
      NEWS entry for HACKING relocation.
    ------------------------------------------------------------
    revno: 2481.1.1
    revision-id: robertc at robertcollins.net-20070507164814-wpagonutf4b5cf8s
    parent: pqm at pqm.ubuntu.com-20070504034556-wzcw478l7qkppkq0
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: roadmap
    timestamp: Tue 2007-05-08 02:48:14 +1000
    message:
      Move HACKING to docs/developers/HACKING and adjust Makefile to accomodate this.
-------------- next part --------------

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


More information about the bazaar-commits mailing list