Rev 1484: merge from bzr.dev in /home/robertc/source/baz/versioned-file-versioned-file-api/

Robert Collins robertc at robertcollins.net
Tue Feb 28 04:52:40 GMT 2006


------------------------------------------------------------
revno: 1484
revision-id: robertc at robertcollins.net-20060228045234-d1856c4499648fb7
parent: robertc at robertcollins.net-20060222103505-bddb211d353f2543
parent: pqm at pqm.ubuntu.com-20060228043846-eb79299c08edb05c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-versioned-file-api
timestamp: Tue 2006-02-28 15:52:34 +1100
message:
  merge from bzr.dev
removed:
  doc/Makefile                   Makefile-20050309064830-17b60435388a9520
  doc/adoption.txt               adoption.txt-20050309044946-816486d97a97c5c5
  doc/bitkeeper.txt              bitkeeper.txt-20050309044946-9e207c5bfce2670f
  doc/changelogs.txt             changelogs.txt-20050309044946-cdc40a9f9ddece03
  doc/cherry-picking.txt         cherry-picking.txt-20050309044946-d14f736fdb588e8f
  doc/cmdref.txt                 cmdref.txt-20050309044946-d9a444af4c8e2d8b
  doc/common-format.txt          common-format.txt-20050309044946-48fc9f627ac98c0a
  doc/compared-aegis.txt         compared-aegis.txt-20050309044946-2c8b94a645654397
  doc/compared-codeville.txt     compared-codeville.txt-20050309044946-1cb208cab910fa50
  doc/compared-cvsnt.txt         compared-cvsnt.txt-20050309044946-5396218e1b8351fb
  doc/compared-opencm.txt        compared-opencm.txt-20050309044946-e7ddc908a19c87f5
  doc/compared-prcs.txt          compared-prcs.txt-20050309044946-f7c399f458e1fb59
  doc/compared-teamware.txt      compared-teamware.txt-20050309044946-8d9e164d94ba5a7c
  doc/compression.txt            compression.txt-20050309044946-a73f1e60c40ee57d
  doc/config-specs.txt           config-specs.txt-20050309044946-d9820c58b7f23437
  doc/conflicts.txt              conflicts.txt-20050309044946-b9f2aded67790400
  doc/costs.txt                  costs.txt-20050309044946-57b65806cab34815
  doc/darcs.txt                  darcs.txt-20050309044946-5dbd16bd2da081a4
  doc/deadly-sins.txt            deadly-sins.txt-20050309044946-b0453a1c48093054
  doc/default.css                default.css-20050309064830-2b764767f5f259c8
  doc/design.txt                 design.txt-20050309044946-54973dca2e7aa16b
  doc/extra-commands.txt         extra-commands.txt-20050309044946-74af949c5805df22
  doc/formats.txt                formats.txt-20050309044946-7ea328cdb5cae6c5
  doc/hashes.txt                 hashes.txt-20050309044946-7a7382d0d715151f
  doc/ignore.txt                 ignore.txt-20050328001329-d89006518f61dd00
  doc/index.txt                  index.txt-20050309044946-be91bf1c15711e5f
  doc/interrupted.txt            interrupted.txt-20050309044946-b6074892ab231e63
  doc/intro.txt                  intro.txt-20050309044946-5bb22ffbfa8bfc14
  doc/inventory.txt              inventory.txt-20050309044946-07534ab6d8b3c324
  doc/join-branches.txt          join-branches.txt-20050309044946-f635037a889c0388
  doc/kill-version.txt           kill-version.txt-20050309044946-1b9d175ca38c872c
  doc/layers.txt                 layers.txt-20050309044946-a48f19d7e271ec87
  doc/library-interface.txt      library-interface.txt-20050309044946-97a60acc594383cc
  doc/merge.txt                  merge.txt-20050309044946-5d1ff42572fb3086
  doc/mirroring.txt              mirroring.txt-20050309044946-eb411f73887829b1
  doc/monotone.txt               monotone.txt-20050309044946-dd2abf24d99d201f
  doc/news.txt                   news.txt-20050309044946-02b97194f31e86e0
  doc/optional-edit.txt          optional-edit.txt-20050309044946-eddc8e1d07ae10a8
  doc/partial-commit.txt         partial-commit.txt-20050309044946-76fa39222d4fcc58
  doc/pool.txt                   pool.txt-20050309044946-4a2400814cb5087a
  doc/purpose.txt                purpose.txt-20050309044946-a4132525edac8d4c
  doc/python.txt                 python.txt-20050309044946-9eeeab2c3546abe6
  doc/quilt.txt                  quilt.txt-20050309044946-00df099b997fed5e
  doc/quotes.txt                 quotes.txt-20050405082015-452551230e0449de
  doc/random.txt                 random.txt-20050309044946-269c29512b381f5b
  doc/requirements.txt           requirements.txt-20050309044946-f01e5318ade63900
  doc/revfile-annotation.txt     revfile-annotation.txt-20050506031945-df4979abfd97e9e5
  doc/revfile.txt                revfile.txt-20050502050837-bc61156895d29c06
  doc/revision-syntax.txt        revision-syntax.txt-20050309044946-86b3a8e902a15fa4
  doc/rollup.txt                 rollup.txt-20050309044946-e551f4f85db5a5a0
  doc/scalability.txt            scalability.txt-20050309044946-646ac26c7fd65298
  doc/security.txt               security.txt-20050309044946-41f7c6000b1124d0
  doc/shared-branches.txt        shared-branches.txt-20050309044946-20521acf9bda9528
  doc/short-demo.txt             short-demo.txt-20050309044946-2145761a6909b03e
  doc/split-join-files.txt       splitjoinfiles.txt-20050729195020-922f30aa94b48fb2
  doc/supportability.txt         supportability.txt-20050309044946-92aeba826c90201b
  doc/svk.txt                    svk.txt-20050309044946-c62acd7cee590d22
  doc/switch-in-branch.txt       switch-in-branch.txt-20050503074831-5840fa742765c32c
  doc/tagging.txt                tagging.txt-20050309044946-66adf967ad987472
  doc/taxonomy.txt               taxonomy.txt-20050309044946-922fe1158868767f
  doc/thanks.txt                 thanks.txt-20050309044946-58141ea3091846d8
  doc/todo-from-arch.txt         todo-from-arch.txt-20050309044946-4cb8ccdf8b3fcd07
  doc/unchanged.txt              unchanged.txt-20050309044946-fe7d1ec585585702
  doc/unrelated-merge.txt        unrelated-merge.txt-20050309044946-ec165531264f1c99
  doc/usability.txt              usability.txt-20050309044946-57e59739a429628b
  doc/use-cases.txt              use-cases.txt-20050309044946-19871d18448c91fc
  doc/web-interface.txt          web-interface.txt-20050309044946-65ca85c7f551bf88
  doc/workflow.txt               workflow.txt-20050309044946-d214d0e0429e719e
  doc/yaml.txt                   yaml.txt-20050309044946-8d597bdf670d9095
  notes/inventory-v2-sample.xml  inventoryv2sample.xml-20050819213418-0c7e0d05c8cc22c9
  notes/inventory-v2.rnc         inventoryv2.rnc-20050819213418-0df79b018e8a74b0
  notes/new-inventory-sample.xml new-inventory-sample.xml-20050330222648-c3f84521f797017e
  notes/performance.txt          performance.txt-20050309064844-d9647fd301942365
  notes/revfile.txt              revfile.txt-20050409124932-50aa1e07060dce594946a6da
  notes/schemas.xml              schemas.xml-20050819213418-a9335f384d9b6367
added:
  bzrlib/lockdir.py              lockdir.py-20060220222025-98258adf27fbdda3
  bzrlib/tests/blackbox/test_aliases.py test_aliases.py-20060210230318-f0c08c9294dbfae1
  bzrlib/tests/test_lockdir.py   test_lockdir.py-20060220222025-33d4221569a3d600
  bzrlib/tests/workingtree_implementations/test_pull.py test_pull.py-20060222044334-43594dd8e143b708
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
  bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
  bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
  bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/externalcommand.py      externalcommand.py-20050901092254-b4fc642a55bb815b
  bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
  bzrlib/help.py                 help.py-20050505025907-4dd7a6d63912f894
  bzrlib/lockable_files.py       control_files.py-20051111201905-bb88546e799d669f
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
  bzrlib/msgeditor.py            msgeditor.py-20050901111708-ef6d8de98f5d8f2f
  bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/rio.py                  rio.py-20051128032247-770b120b34dfff60
  bzrlib/sign_my_commits.py      sign_my_commits.py-20060215152201-5a6363365180e671
  bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
  bzrlib/symbol_versioning.py    symbol_versioning.py-20060105104851-9ecf8af605d15a80
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
  bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
  bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
  bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
  bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
  bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
  bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
  bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
  bzrlib/tests/repository_implementations/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
  bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
  bzrlib/tests/test_bad_files.py test_bad_files.py-20050918155938-c76a2295c8ab9503
  bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
  bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
  bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
  bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
  bzrlib/tests/test_rio.py       test_rio.py-20051128032247-dcd1082dfc86d3d3
  bzrlib/tests/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
  bzrlib/tests/test_symbol_versioning.py test_symbol_versioning.py-20060105104851-51d7722c2018d42b
  bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
  bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
  bzrlib/tests/test_ui.py        test_ui.py-20051130162854-458e667a7414af09
  bzrlib/tests/test_uncommit.py  test_uncommit.py-20051027212835-84944b63adae51be
  bzrlib/tests/test_upgrade.py   test_upgrade.py-20051004040251-555fe1d2bae1bc71
  bzrlib/tests/test_weave.py     testknit.py-20050627023648-9833cc5562ffb785
  bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
  bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
  bzrlib/transactions.py         transactions.py-20051007010900-f1313d53cf58e223
  bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
  bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
  bzrlib/transport/http.py       http_transport.py-20050711212304-506c5fd1059ace96
  bzrlib/transport/local.py      local_transport.py-20050711165921-9b1f142bfe480c24
  bzrlib/transport/memory.py     memory.py-20051016101338-cd008dbdf69f04fc
  bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
  bzrlib/uncommit.py             uncommit.py-20050626215513-5ec509fa425b305c
  bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060228043846-eb79299c08edb05c
    parent: pqm at pqm.ubuntu.com-20060228043506-6627101e946abb2d
    parent: robertc at robertcollins.net-20060228043150-fdb9c7f7231b271b
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2006-02-28 04:38:46 +0000
    message:
      Bugfix aliases to be backwards compatible with plugins providing command.run_argv.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060228043150-fdb9c7f7231b271b
    parent: pqm at pqm.ubuntu.com-20060227173450-dd501228d2297c7c
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Tue 2006-02-28 15:31:50 +1100
    message:
      Bugfix aliases to be backwards compatible with plugins providing command.run_argv.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060227173450-dd501228d2297c7c
    parent: pqm at pqm.ubuntu.com-20060225171542-6a7c8869b0b4003a
    parent: abentley at panoramicfeedback.com-20060227172934-62a3451d61bbe5a4
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2006-02-27 17:34:50 +0000
    message:
      Whitespace fix
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060227172934-62a3451d61bbe5a4
    parent: abentley at panoramicfeedback.com-20060224161241-7875e2e8984975dd
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's integration
    timestamp: Mon 2006-02-27 12:29:34 -0500
    message:
      Whitespace fix
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060224161241-7875e2e8984975dd
    parent: abentley at panoramicfeedback.com-20060224155924-76be8b8c3cb16ebf
    parent: erik at bagfors.nu-20060224151736-92b72bcee550c0a3
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's integration
    timestamp: Fri 2006-02-24 11:12:41 -0500
    message:
      Merge trivial bugfix to --no-alias handling
    ------------------------------------------------------------
    merged: erik at bagfors.nu-20060224151736-92b72bcee550c0a3
    parent: erik at bagfors.nu-20060224151719-82d23285c19fae0f
    committer: Erik BÃ¥gfors <erik at bagfors.nu>
    branch nick: bzr.aliases
    timestamp: Fri 2006-02-24 16:17:36 +0100
    message:
      fix for broken --no-aliases
    ------------------------------------------------------------
    merged: erik at bagfors.nu-20060224151719-82d23285c19fae0f
    parent: erik at bagfors.nu-20060224144824-c93eef97b8b57aa0
    committer: Erik BÃ¥gfors <erik at bagfors.nu>
    branch nick: bzr.aliases
    timestamp: Fri 2006-02-24 16:17:19 +0100
    message:
      better test for --no-aliases
    ------------------------------------------------------------
    merged: erik at bagfors.nu-20060224144824-c93eef97b8b57aa0
    parent: erik at bagfors.nu-20060223180842-e2ac0eaaa6225586
    parent: pqm at pqm.ubuntu.com-20060224063236-f5dbbf84724f64ca
    committer: Erik BÃ¥gfors <erik at bagfors.nu>
    branch nick: bzr.aliases
    timestamp: Fri 2006-02-24 15:48:24 +0100
    message:
      [merge] bzr.dev
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060224063236-f5dbbf84724f64ca
    parent: pqm at pqm.ubuntu.com-20060224062138-345a2355879e8d56
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2006-02-24 06:32:36 +0000
    message:
      Got uncommit working properly with checkouts
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060224062138-345a2355879e8d56
    parent: pqm at pqm.ubuntu.com-20060223223550-c0c332a9bd74e247
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2006-02-24 06:21:38 +0000
    message:
      Alias update
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060223223550-c0c332a9bd74e247
    parent: pqm at pqm.ubuntu.com-20060223170304-293223b3e089d67f
    parent: abentley at panoramicfeedback.com-20060223151247-9dc5e11197026907
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2006-02-23 22:35:50 +0000
    message:
      Made weave conflict markers customizable, standardized defaults
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060223151247-9dc5e11197026907
    parent: abentley at panoramicfeedback.com-20060222151734-971c78a549ceb342
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Transactional Tree Transforms
    timestamp: Thu 2006-02-23 10:12:47 -0500
    message:
      Made weave conflict markers customizable, standardized defaults
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060222151734-971c78a549ceb342
    parent: abentley at panoramicfeedback.com-20060222144836-2f0d747f39d956c3
    parent: abentley at panoramicfeedback.com-20060222145113-495a9bf46e37e439
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Transactional Tree Transforms
    timestamp: Wed 2006-02-22 10:17:34 -0500
    message:
      Merge from integration
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060222145113-495a9bf46e37e439
    parent: abentley at panoramicfeedback.com-20060221212021-98bc6d0d4a1e7639
    parent: pqm at pqm.ubuntu.com-20060222075956-fb281c427e571da6
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's integration
    timestamp: Wed 2006-02-22 09:51:13 -0500
    message:
      Merge from mainline
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060222075956-fb281c427e571da6
    parent: pqm at pqm.ubuntu.com-20060222061939-b4b7825d1d580ccf
    parent: mbp at sourcefrog.net-20060222070612-c108852197fc0ca4
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2006-02-22 07:59:56 +0000
    message:
      add LockDir and related fixes
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060222070612-c108852197fc0ca4
    parent: mbp at sourcefrog.net-20060222070544-f7808ac1678c0ec8
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.locks
    timestamp: Wed 2006-02-22 18:06:12 +1100
    message:
      LockDir review comment fixes
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060222070544-f7808ac1678c0ec8
    parent: mbp at sourcefrog.net-20060222055200-25345f9a35e8905d
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.locks
    timestamp: Wed 2006-02-22 18:05:44 +1100
    message:
      rio files are always externalized in utf-8.  test this.
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060222055200-25345f9a35e8905d
    parent: mbp at sourcefrog.net-20060222054252-b0d965d7cce9ccec
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.locks
    timestamp: Wed 2006-02-22 16:52:00 +1100
    message:
      LockDir doc corrections
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060222054252-b0d965d7cce9ccec
    parent: mbp at sourcefrog.net-20060222043733-6fc1f11e6b19ba79
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.locks
    timestamp: Wed 2006-02-22 16:42:52 +1100
    message:
      docstring for LockDir.unlock
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060222043733-6fc1f11e6b19ba79
    parent: mbp at sourcefrog.net-20060222042954-60333f08dd56a646
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.locks
    timestamp: Wed 2006-02-22 15:37:33 +1100
    message:
      Fix test_progress_note for non-80-character terminals
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060222042954-60333f08dd56a646
    parent: mbp at sourcefrog.net-20060221224609-a7f433d0488c080d
    parent: pqm at pqm.ubuntu.com-20060221231239-643b2cbe5aefc06a
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.locks
    timestamp: Wed 2006-02-22 15:29:54 +1100
    message:
      [merge] from bzr.dev before integration
      Fix undefined ordering in sign_my_revisions breaking tests
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060221231239-643b2cbe5aefc06a
    parent: pqm at pqm.ubuntu.com-20060221212748-e81c0691edf46b65
    parent: robertc at robertcollins.net-20060221224858-2b61aaa0f1636293
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2006-02-21 23:12:39 +0000
    message:
      Fixup internally generated deprecation warning from merge_inner and unbreak bzr push to new sftp branches.
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060221224609-a7f433d0488c080d
    parent: mbp at sourcefrog.net-20060221223325-0fbe4e9583b6d853
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.locks
    timestamp: Wed 2006-02-22 09:46:09 +1100
    message:
      Confirm that only the intended holder of a lock was broken.
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060221223325-0fbe4e9583b6d853
    parent: mbp at sourcefrog.net-20060221223022-0d73c36b63fc9bcf
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.locks
    timestamp: Wed 2006-02-22 09:33:25 +1100
    message:
      Breaking an already-released lock should just succeed
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060221223022-0d73c36b63fc9bcf
    parent: mbp at sourcefrog.net-20060221223009-af22e77274dc6fda
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.locks
    timestamp: Wed 2006-02-22 09:30:22 +1100
    message:
      New LockDir.force_break and simple test case
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060221223009-af22e77274dc6fda
    parent: mbp at sourcefrog.net-20060221080504-583fd88ceaa3b637
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.locks
    timestamp: Wed 2006-02-22 09:30:09 +1100
    message:
      Warning to check storage when lock was broken
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060221080504-583fd88ceaa3b637
    parent: mbp at sourcefrog.net-20060221080327-b1723b722187fb63
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.locks-fixed
    timestamp: Tue 2006-02-21 19:05:04 +1100
    message:
      Start LockDir.confirm method and LockBroken exception
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060221080327-b1723b722187fb63
    parent: mbp at sourcefrog.net-20060221075354-3e2bbf0985b5523b
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.locks-fixed
    timestamp: Tue 2006-02-21 19:03:27 +1100
    message:
      Change fancy_rename to use rand_chars rather than reinvent it.
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060221075354-3e2bbf0985b5523b
    parent: mbp at sourcefrog.net-20060221074858-d25cba72aacf23c0
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.locks-fixed
    timestamp: Tue 2006-02-21 18:53:54 +1100
    message:
      Put default LockDir timeouts in variables; increase timeout to 3min
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060221074858-d25cba72aacf23c0
    parent: mbp at sourcefrog.net-20060221070416-8aab7f0579cf38fb
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.locks-fixed
    timestamp: Tue 2006-02-21 18:48:58 +1100
    message:
      Start adding LockDir.confirm() method
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060221070416-8aab7f0579cf38fb
    parent: mbp at sourcefrog.net-20060221070359-e334fefdbbc1a45b
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.locks-fixed
    timestamp: Tue 2006-02-21 18:04:16 +1100
    message:
      Run lockdir doctests
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060221070359-e334fefdbbc1a45b
    parent: mbp at sourcefrog.net-20060221070119-53697c8b1677ad18
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.locks-fixed
    timestamp: Tue 2006-02-21 18:03:59 +1100
    message:
      LockDir should use Transport.rename when releasing locks too.
      
      Add simple example of usage as a doctest.
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060221070119-53697c8b1677ad18
    parent: mbp at sourcefrog.net-20060221065951-2f56678a03b687bc
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.locks-fixed
    timestamp: Tue 2006-02-21 18:01:19 +1100
    message:
      Transport.rename should be unimplemented in base class
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060221065951-2f56678a03b687bc
    parent: mbp at sourcefrog.net-20060221063220-73a013b7fd48f00a
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.locks-fixed
    timestamp: Tue 2006-02-21 17:59:51 +1100
    message:
      MemoryTransport.rename() must raise exceptions on collision
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060221063220-73a013b7fd48f00a
    parent: mbp at sourcefrog.net-20060221062726-31a9869e855950a1
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.locks-fixed
    timestamp: Tue 2006-02-21 17:32:20 +1100
    message:
      MemoryTransport should indicate ENOTEMPTY on rmdir of nonempty, same as unix
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060221062726-31a9869e855950a1
    parent: mbp at sourcefrog.net-20060221060201-5f260bfe331bdc42
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.locks-fixed
    timestamp: Tue 2006-02-21 17:27:26 +1100
    message:
      doc
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060221060201-5f260bfe331bdc42
    parent: mbp at sourcefrog.net-20060220222036-702b0aca3e25b5f8
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.locks-fixed
    timestamp: Tue 2006-02-21 17:02:01 +1100
    message:
      New Transport.rename that mustn't overwrite
      Change LockDir.is_held to be a property
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060220222036-702b0aca3e25b5f8
    parent: mbp at sourcefrog.net-20060220221907-cd373a4714178400
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.locks-fixed
    timestamp: Tue 2006-02-21 09:20:36 +1100
    message:
      New LockDir locking mechanism
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060220221907-cd373a4714178400
    parent: mbp at sourcefrog.net-20060220220528-33bc3e992d169b4c
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.locks-fixed
    timestamp: Tue 2006-02-21 09:19:07 +1100
    message:
      Change some lock and transaction related exceptions to BzrNewException style
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060220220528-33bc3e992d169b4c
    parent: mbp at sourcefrog.net-20060217205311-9f0171d976e71e3f
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.locks-fixed
    timestamp: Tue 2006-02-21 09:05:28 +1100
    message:
      New DirectoryNotEmpty exception, and raise this from local and memory 
      transports.
      
      Check that some PathError is raised when trying to remove a non-empty
      directory - not necessarily DirectoryNotEmpty because sftp can't detect 
      it.
      
      -- This line and the following will be ignored --
      
      modified:
        bzrlib/errors.py
        bzrlib/tests/test_transport_implementations.py
        bzrlib/transport/__init__.py
        bzrlib/transport/memory.py
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060217205311-9f0171d976e71e3f
    parent: mbp at sourcefrog.net-20060217204603-7cbfc062067a1c06
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.locks-fixed
    timestamp: Sat 2006-02-18 07:53:11 +1100
    message:
      Add TestCaseWithTransport.get_transport and get_readonly_transport
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060217204603-7cbfc062067a1c06
    parent: mbp at sourcefrog.net-20060217204417-fb97e1eb0e03ee38
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.locks-fixed
    timestamp: Sat 2006-02-18 07:46:03 +1100
    message:
      New Rio.as_dict method
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060217204417-fb97e1eb0e03ee38
    parent: mbp at sourcefrog.net-20060217203719-b6f5b2a00d602a94
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.locks-fixed
    timestamp: Sat 2006-02-18 07:44:17 +1100
    message:
      rio.Stanza.add should raise TypeError on invalid types.
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060217203719-b6f5b2a00d602a94
    parent: mbp at sourcefrog.net-20060217203430-d15f555c71a6c0cd
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.locks-fixed
    timestamp: Sat 2006-02-18 07:37:19 +1100
    message:
      Clean up comments
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060217203430-d15f555c71a6c0cd
    parent: mbp at sourcefrog.net-20060210003925-8c64dd0c0a16d177
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.locks-fixed
    timestamp: Sat 2006-02-18 07:34:30 +1100
    message:
      New utility routine rand_chars
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060210003925-8c64dd0c0a16d177
    parent: mbp at sourcefrog.net-20060206103146-8bfb9a1bba84d2c9
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Fri 2006-02-10 11:39:25 +1100
    message:
      [patch] better formatting for 'bzr help commands' (Matthew D Fuller)
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060206103146-8bfb9a1bba84d2c9
    parent: mbp at sourcefrog.net-20060206075542-12d94bc024f020e3
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Mon 2006-02-06 21:31:46 +1100
    message:
      [patch] Rename TestCase.AssertSubset to assertSubset for consistency (Jan Hudec)
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060206075542-12d94bc024f020e3
    parent: mbp at sourcefrog.net-20060201131742-6f81ba01f409cc1a
    parent: robertc at robertcollins.net-20060201211329-b3faf2a411316ff7
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Mon 2006-02-06 18:55:42 +1100
    message:
      [merge] robertc
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060201131742-6f81ba01f409cc1a
    parent: mbp at sourcefrog.net-20060201130813-1240ac51411d1330
    parent: john at arbash-meinel.com-20060131200102-1cc580967bd9fe7b
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Thu 2006-02-02 00:17:42 +1100
    message:
      [merge] jam-integration
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060222061939-b4b7825d1d580ccf
    parent: pqm at pqm.ubuntu.com-20060222055120-bc7ccf0ab92d1632
    parent: robertc at robertcollins.net-20060222055846-190a2944772a7125
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2006-02-22 06:19:39 +0000
    message:
      Merge in ui for creating and converting to knit branch - no backend support yet.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060222055846-190a2944772a7125
    parent: robertc at robertcollins.net-20060222054547-70f045f317b7993b
    parent: robertc at robertcollins.net-20060222055644-1c843d87efc1c539
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Wed 2006-02-22 16:58:46 +1100
    message:
      Merge in ui for creating and converting to knit branch - no backend support yet.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060222055644-1c843d87efc1c539
    parent: robertc at robertcollins.net-20060221124257-8ee8f4b0b3b45ac3
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-new-repo-format
    timestamp: Wed 2006-02-22 16:56:44 +1100
    message:
      Review feedback.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060221124257-8ee8f4b0b3b45ac3
    parent: robertc at robertcollins.net-20060221054521-b26e1fd3b723dc00
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-new-repo-format
    timestamp: Tue 2006-02-21 23:42:57 +1100
    message:
      Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060221054521-b26e1fd3b723dc00
    parent: robertc at robertcollins.net-20060221015126-bde20d0239fd8c47
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-new-repo-format
    timestamp: Tue 2006-02-21 16:45:21 +1100
    message:
      Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060221015126-bde20d0239fd8c47
    parent: robertc at robertcollins.net-20060221004343-ccf22f64d96aa17d
    parent: robertc at robertcollins.net-20060221014955-c8bdf2cae88c5e34
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-new-repo-format
    timestamp: Tue 2006-02-21 12:51:26 +1100
    message:
      Merge in InterRepository api to have it available.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060222054547-70f045f317b7993b
    parent: robertc at robertcollins.net-20060221224858-2b61aaa0f1636293
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Wed 2006-02-22 16:45:47 +1100
    message:
      Fix 'bzr pull' on metadir trees.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060222055120-bc7ccf0ab92d1632
    parent: pqm at pqm.ubuntu.com-20060221231239-643b2cbe5aefc06a
    parent: robertc at robertcollins.net-20060222054547-70f045f317b7993b
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2006-02-22 05:51:20 +0000
    message:
      Fix 'bzr pull' on metadir trees.
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060222144836-2f0d747f39d956c3
    parent: abentley at panoramicfeedback.com-20060222143942-ae72299f2de66767
    parent: abentley at panoramicfeedback.com-20060221212021-98bc6d0d4a1e7639
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Transactional Tree Transforms
    timestamp: Wed 2006-02-22 09:48:36 -0500
    message:
      Merge from integration
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060222143942-ae72299f2de66767
    parent: aaron.bentley at utoronto.ca-20060221012744-0dfd362401335acb
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Transactional Tree Transforms
    timestamp: Wed 2006-02-22 09:39:42 -0500
    message:
      Fixed build_tree with symlinks
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060223170304-293223b3e089d67f
    parent: pqm at pqm.ubuntu.com-20060223020544-d9efcf806507124f
    parent: abentley at panoramicfeedback.com-20060223155612-fdd05be6c2bf7647
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2006-02-23 17:03:04 +0000
    message:
      Merge user command aliases
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060223155612-fdd05be6c2bf7647
    parent: abentley at panoramicfeedback.com-20060223154719-f0252665a9d183f4
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's integration
    timestamp: Thu 2006-02-23 10:56:12 -0500
    message:
      Cleaned up some long lines
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060223154719-f0252665a9d183f4
    parent: abentley at panoramicfeedback.com-20060223152222-9fa833278b24c69d
    parent: erik at bagfors.nu-20060222203325-33baad9691a8ed45
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's integration
    timestamp: Thu 2006-02-23 10:47:19 -0500
    message:
      Merged aliases
    ------------------------------------------------------------
    merged: erik at bagfors.nu-20060222203325-33baad9691a8ed45
    parent: erik at bagfors.nu-20060219213505-d8e456c1314d1803
    committer: Erik BÃ¥gfors <erik at bagfors.nu>
    branch nick: bzr.aliases
    timestamp: Wed 2006-02-22 21:33:25 +0100
    message:
      remove AliasConfig, based on input from abentley
    ------------------------------------------------------------
    merged: erik at bagfors.nu-20060219213505-d8e456c1314d1803
    parent: erik at bagfors.nu-20060219211432-997baee7a9f60fe2
    committer: Erik BÃ¥gfors <erik at bagfors.nu>
    branch nick: bzr.aliases
    timestamp: Sun 2006-02-19 22:35:05 +0100
    message:
      small bugfixes, all tests pass now
    ------------------------------------------------------------
    merged: erik at bagfors.nu-20060219211432-997baee7a9f60fe2
    parent: erik at bagfors.nu-20060213002618-6ad160456d097750
    parent: john at arbash-meinel.com-20060217035556-b86991407ef095d9
    committer: Erik BÃ¥gfors <erik at bagfors.nu>
    branch nick: bzr.aliases
    timestamp: Sun 2006-02-19 22:14:32 +0100
    message:
      [merge] jam-integration
    ------------------------------------------------------------
    merged: erik at bagfors.nu-20060213002618-6ad160456d097750
    parent: erik at bagfors.nu-20060212093413-c9c190e6b3724a36
    committer: Erik BÃ¥gfors <erik at bagfors.nu>
    branch nick: bzr.aliases
    timestamp: Mon 2006-02-13 01:26:18 +0100
    message:
      PEP8-ify
    ------------------------------------------------------------
    merged: erik at bagfors.nu-20060212093413-c9c190e6b3724a36
    parent: erik at bagfors.nu-20060212093054-ed7f716f6a413545
    committer: Erik BÃ¥gfors <erik at bagfors.nu>
    branch nick: bzr.aliases
    timestamp: Sun 2006-02-12 10:34:13 +0100
    message:
      support for overrides
    ------------------------------------------------------------
    merged: erik at bagfors.nu-20060212093054-ed7f716f6a413545
    parent: erik at bagfors.nu-20060210230401-7d3e63eb62d1dca9
    committer: Erik BÃ¥gfors <erik at bagfors.nu>
    branch nick: bzr.aliases
    timestamp: Sun 2006-02-12 10:30:54 +0100
    message:
      test for option overrides
    ------------------------------------------------------------
    merged: erik at bagfors.nu-20060210230401-7d3e63eb62d1dca9
    parent: erik at bagfors.nu-20060210192747-e7864d409e0635b1
    committer: Erik BÃ¥gfors <erik at bagfors.nu>
    branch nick: bzr.aliases
    timestamp: Sat 2006-02-11 00:04:01 +0100
    message:
      blackbox tests for aliases,--no-aliases and aliases with options
    ------------------------------------------------------------
    merged: erik at bagfors.nu-20060210192747-e7864d409e0635b1
    parent: erik at bagfors.nu-20060210192701-b2a976cfe4b5d6af
    committer: Erik BÃ¥gfors <erik at bagfors.nu>
    branch nick: bzr.aliases
    timestamp: Fri 2006-02-10 20:27:47 +0100
    message:
      restructured NEWS
    ------------------------------------------------------------
    merged: erik at bagfors.nu-20060210192701-b2a976cfe4b5d6af
    parent: erik at bagfors.nu-20060206194719-19f4a9d2e55e858c
    parent: john at arbash-meinel.com-20060206140209-793eeeb7f3f3d069
    committer: Erik BÃ¥gfors <erik at bagfors.nu>
    branch nick: bzr.aliases
    timestamp: Fri 2006-02-10 20:27:01 +0100
    message:
      merge from jam-integration
    ------------------------------------------------------------
    merged: erik at bagfors.nu-20060206194719-19f4a9d2e55e858c
    parent: erik at bagfors.nu-20060205195332-7e0fcfad160dc1c7
    committer: Erik BÃ¥gfors <erik at bagfors.nu>
    branch nick: bzr.aliases
    timestamp: Mon 2006-02-06 20:47:19 +0100
    message:
      tests for AliasesConfig
    ------------------------------------------------------------
    merged: erik at bagfors.nu-20060205195332-7e0fcfad160dc1c7
    parent: erik at bagfors.nu-20060205194946-ce8d8bf0361dc98f
    committer: Erik BÃ¥gfors <erik at bagfors.nu>
    branch nick: bzr.aliases
    timestamp: Sun 2006-02-05 20:53:32 +0100
    message:
      documentation and NEWS
    ------------------------------------------------------------
    merged: erik at bagfors.nu-20060205194946-ce8d8bf0361dc98f
    parent: mbp at sourcefrog.net-20060201130813-1240ac51411d1330
    committer: Erik BÃ¥gfors <erik at bagfors.nu>
    branch nick: bzr.aliases
    timestamp: Sun 2006-02-05 20:49:46 +0100
    message:
      support for aliases in bazaar.conf
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060223152222-9fa833278b24c69d
    parent: aaron.bentley at utoronto.ca-20060223014622-df3b5199ff942457
    parent: pqm at pqm.ubuntu.com-20060223020544-d9efcf806507124f
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's integration
    timestamp: Thu 2006-02-23 10:22:22 -0500
    message:
      Merge from mainline
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060223020544-d9efcf806507124f
    parent: pqm at pqm.ubuntu.com-20060223014557-ea05fae543e31ae5
    parent: aaron.bentley at utoronto.ca-20060223014622-df3b5199ff942457
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2006-02-23 02:05:44 +0000
    message:
      Fix handling of non-http errors produced by http transport
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060223014622-df3b5199ff942457
    parent: abentley at panoramicfeedback.com-20060222145113-495a9bf46e37e439
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzr.ab.integration
    timestamp: Wed 2006-02-22 20:46:22 -0500
    message:
      Fix handling of non-http errors produced by http transport
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060223014557-ea05fae543e31ae5
    parent: pqm at pqm.ubuntu.com-20060222234141-cfd8f6db9a98d888
    parent: aaron.bentley at utoronto.ca-20060223013420-3faa7e2c505f3063
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2006-02-23 01:45:57 +0000
    message:
      Got status working properly with checkouts
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060223013420-3faa7e2c505f3063
    parent: aaron.bentley at utoronto.ca-20060223012941-0b2f131851fef01e
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Wed 2006-02-22 20:34:20 -0500
    message:
      whitespace fixups
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060223012941-0b2f131851fef01e
    parent: abentley at panoramicfeedback.com-20060222235928-cfa96b4cc442862f
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Wed 2006-02-22 20:29:41 -0500
    message:
      Niced up the documentation
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060222235928-cfa96b4cc442862f
    parent: abentley at panoramicfeedback.com-20060222235432-307f4397ab70242e
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's small fixes
    timestamp: Wed 2006-02-22 18:59:28 -0500
    message:
      Whitespace fix
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060222235432-307f4397ab70242e
    parent: abentley at panoramicfeedback.com-20060222235009-0f07b75e2fc4d0a5
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's small fixes
    timestamp: Wed 2006-02-22 18:54:32 -0500
    message:
      Fix status to work with checkouts
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060222235009-0f07b75e2fc4d0a5
    parent: abentley at panoramicfeedback.com-20060213194322-559e96ff793e0682
    parent: abentley at panoramicfeedback.com-20060222145113-495a9bf46e37e439
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's small fixes
    timestamp: Wed 2006-02-22 18:50:09 -0500
    message:
      Merge from integration
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060222234141-cfd8f6db9a98d888
    parent: pqm at pqm.ubuntu.com-20060222222053-2c5bf0ca6e71f18d
    parent: robertc at robertcollins.net-20060222233130-dfffba0d31e6a77a
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2006-02-22 23:41:41 +0000
    message:
      Add tests for sftp push, and NonLocalTets for BzrDir.create_branch_convenience, before fixing the failure of it to work on non-local urls.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060222233130-dfffba0d31e6a77a
    parent: pqm at pqm.ubuntu.com-20060222222053-2c5bf0ca6e71f18d
    parent: robertc at robertcollins.net-20060222230229-d5e0fb4ab1f46d9a
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Thu 2006-02-23 10:31:30 +1100
    message:
      Add tests for sftp push, and NonLocalTets for BzrDir.create_branch_convenience, before fixing the failure of it to work on non-local urls.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060222230229-d5e0fb4ab1f46d9a
    parent: robertc at robertcollins.net-20060222055846-190a2944772a7125
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Thu 2006-02-23 10:02:29 +1100
    message:
      Add tests for sftp push, and NonLocalTets for BzrDir.create_branch_convenience, before fixing the failure of it to work on non-local urls.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060222222053-2c5bf0ca6e71f18d
    parent: pqm at pqm.ubuntu.com-20060222075956-fb281c427e571da6
    parent: abentley at panoramicfeedback.com-20060222151734-971c78a549ceb342
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2006-02-22 22:20:53 +0000
    message:
      Fixed build_tree with symlinks
    ------------------------------------------------------------
    merged: erik at bagfors.nu-20060223180842-e2ac0eaaa6225586
    parent: erik at bagfors.nu-20060223180659-bdf607b5e68f9671
    committer: Erik BÃ¥gfors <erik at bagfors.nu>
    branch nick: bzr.aliases
    timestamp: Thu 2006-02-23 19:08:42 +0100
    message:
      change get_alias summary to be shorter
    ------------------------------------------------------------
    merged: erik at bagfors.nu-20060223180659-bdf607b5e68f9671
    parent: erik at bagfors.nu-20060222203325-33baad9691a8ed45
    parent: pqm at pqm.ubuntu.com-20060223170304-293223b3e089d67f
    committer: Erik BÃ¥gfors <erik at bagfors.nu>
    branch nick: bzr.aliases
    timestamp: Thu 2006-02-23 19:06:59 +0100
    message:
      [merge] bzr.dev
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060224155924-76be8b8c3cb16ebf
    parent: aaron.bentley at utoronto.ca-20060224062850-2fbf1755b9d2d50e
    parent: pqm at pqm.ubuntu.com-20060224144300-16a30ef3bb38fb7f
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's integration
    timestamp: Fri 2006-02-24 10:59:24 -0500
    message:
      Merge from bzr.dev
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060224144300-16a30ef3bb38fb7f
    parent: pqm at pqm.ubuntu.com-20060224063236-f5dbbf84724f64ca
    parent: aaron.bentley at utoronto.ca-20060224062850-2fbf1755b9d2d50e
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2006-02-24 14:43:00 +0000
    message:
      Actually apply alias and uncommit fixes
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060224062850-2fbf1755b9d2d50e
    parent: aaron.bentley at utoronto.ca-20060223234417-386601d0a5a613ef
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's integration
    timestamp: Fri 2006-02-24 01:28:50 -0500
    message:
      Got uncommit working properly with checkouts
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060223234417-386601d0a5a613ef
    parent: abentley at panoramicfeedback.com-20060223155612-fdd05be6c2bf7647
    parent: erik at bagfors.nu-20060223180842-e2ac0eaaa6225586
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's integration
    timestamp: Thu 2006-02-23 18:44:17 -0500
    message:
      Alias update
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060225171542-6a7c8869b0b4003a
    parent: pqm at pqm.ubuntu.com-20060224162850-d1f8cb9cdfab3016
    parent: mbp at sourcefrog.net-20060225160014-0f84c48da6119527
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sat 2006-02-25 17:15:42 +0000
    message:
      remove obsolete docs
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060225160014-0f84c48da6119527
    parent: pqm at pqm.ubuntu.com-20060223223550-c0c332a9bd74e247
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.remove-docs
    timestamp: Sun 2006-02-26 03:00:14 +1100
    message:
      Remove various obsolete development notes
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060224162850-d1f8cb9cdfab3016
    parent: pqm at pqm.ubuntu.com-20060224144300-16a30ef3bb38fb7f
    parent: abentley at panoramicfeedback.com-20060224161241-7875e2e8984975dd
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2006-02-24 16:28:50 +0000
    message:
      Merge trivial bugfix to --no-alias handling
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060228043506-6627101e946abb2d
    parent: pqm at pqm.ubuntu.com-20060227173450-dd501228d2297c7c
    parent: abentley at panoramicfeedback.com-20060227163245-a32f152da74b2ecf
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2006-02-28 04:35:06 +0000
    message:
      Fix diff support of checkouts
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060227163245-a32f152da74b2ecf
    parent: abentley at panoramicfeedback.com-20060227162554-fcb79169d6e9ff1f
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's small fixes
    timestamp: Mon 2006-02-27 11:32:45 -0500
    message:
      Rename cmd_show_diff to diff_cmd_helper
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060227162554-fcb79169d6e9ff1f
    parent: aaron.bentley at utoronto.ca-20060223050418-1b37fdcb6f016688
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's small fixes
    timestamp: Mon 2006-02-27 11:25:54 -0500
    message:
      Updated argument names, DRY fixes.
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060223050418-1b37fdcb6f016688
    parent: aaron.bentley at utoronto.ca-20060223013420-3faa7e2c505f3063
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Thu 2006-02-23 00:04:18 -0500
    message:
      Got diff working properly with checkouts



More information about the bazaar-commits mailing list