Rev 5854: Merge bzr.dev 5887, to get the update_basis_by_delta changes in http://bazaar.launchpad.net/~jameinel/bzr/2.4-set-parent-trees-delta-282941

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.4-set-parent-trees-delta-282941

------------------------------------------------------------
revno: 5854 [merge]
revision-id: john at arbash-meinel.com-20110518050100-fuip01rzev5kegtl
parent: john at arbash-meinel.com-20110517144213-da4eaptlnqyxpmoy
parent: pqm at pqm.ubuntu.com-20110518033943-sgm50fqtljmq8ixc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.4-set-parent-trees-delta-282941
timestamp: Wed 2011-05-18 07:01:00 +0200
message:
  Merge bzr.dev 5887, to get the update_basis_by_delta changes
added:
  bzrlib/tests/blackbox/test_remember_option.py test_remember_option-20110517132110-7uv6puheaok558uc-1
modified:
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
  bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
  bzrlib/foreign.py              foreign.py-20081112170002-olsxmandkk8qyfuq-1
  bzrlib/help_topics/en/configuration.txt configuration.txt-20060314161707-868350809502af01
  bzrlib/push.py                 push.py-20080606021927-5fe39050e8xne9un-1
  bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/send.py                 send.py-20090521192735-j7cdb33ykmtmzx4w-1
  bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
  bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
  bzrlib/tests/per_branch/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1
  bzrlib/tests/per_foreign_vcs/test_repository.py test_repository.py-20091014092330-i5ymtg1r2o8quut9-1
  bzrlib/tests/per_interbranch/test_push.py test_push.py-20090330192649-pca31sb2ubbtcs15-1
  bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
  bzrlib/tests/per_workingtree/test_inv.py test_inv.py-20070311221604-ighlq8tbn5xq0kuo-1
  bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
  bzrlib/tests/test_foreign.py   test_foreign.py-20081125004048-ywb901edgp9lluxo-1
  bzrlib/tests/test_inv.py       testinv.py-20050722220913-1dc326138d1a5892
  bzrlib/vf_repository.py        vf_repository.py-20110502151858-yh9nnoxpokg86unk-1
  doc/developers/configuration.txt configuration.txt-20110408142435-korjxxnskvq44sta-1
  doc/developers/overview.txt    overview.txt-20080904022501-ww2ggomrs5elxfm0-1
  doc/en/release-notes/bzr-2.1.txt bzr2.1.txt-20101008081016-21wd86gpfhllpue3-38
  doc/en/release-notes/bzr-2.4.txt bzr2.4.txt-20110114053217-k7ym9jfz243fddjm-1
  doc/ja/index.txt               index.txt-20091029100035-1rni8rgpen0pe1g2-11
  doc/ja/upgrade-guide/data_migration.txt data_migration.txt-20091029100035-1rni8rgpen0pe1g2-20
  doc/ja/user-guide/stacked.txt  stacked.txt-20091029100035-1rni8rgpen0pe1g2-64
-------------- next part --------------

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