Rev 54: Import upstream version 2.1.2 in http://people.canonical.com/~robertc/baz2.0/tmpnbFHFY/upstream

[Robert Collins]

At http://people.canonical.com/~robertc/baz2.0/tmpnbFHFY/upstream

------------------------------------------------------------
revno: 54 [merge]
revision-id: robertc at robertcollins.net-20100527172414-i003ou0ztuxpqfhg
parent: james.westby at ubuntu.com-20100324222738-ceuthj3ypzvd173f
parent: pqm at pqm.ubuntu.com-20100527165824-blsinv7oywcaezy7
committer: Robert Collins <robertc at robertcollins.net>
branch nick: upstream
timestamp: Fri 2010-05-28 05:24:14 +1200
message:
  Import upstream version 2.1.2
added:
  bzrlib/tests/commands/test_revert.py test_revert.py-20100309150314-zqzie40mnu7vcfhg-1
modified:
  NEWS                           news-20091205103605-6tjofjz4i5j16zuv-23
  bzr                            bzr-20091205103605-6tjofjz4i5j16zuv-28
  bzrlib/__init__.py             __init__.py-20091205103605-6tjofjz4i5j16zuv-31
  bzrlib/_annotator_pyx.c        _annotator_pyx.c-20091205103605-6tjofjz4i5j16zuv-1434
  bzrlib/_bencode_pyx.c          _bencode_pyx.c-20091205103605-6tjofjz4i5j16zuv-1381
  bzrlib/_btree_serializer_pyx.c _btree_serializer_py-20091205103605-6tjofjz4i5j16zuv-1446
  bzrlib/_chk_map_pyx.c          _chk_map_pyx.c-20091205103605-6tjofjz4i5j16zuv-1355
  bzrlib/_chunks_to_lines_pyx.c  _chunks_to_lines_pyx-20091205103605-6tjofjz4i5j16zuv-1319
  bzrlib/_dirstate_helpers_pyx.c _dirstate_helpers_py-20091205103605-6tjofjz4i5j16zuv-1436
  bzrlib/_dirstate_helpers_pyx.pyx _dirstate_helpers_py-20091205103605-6tjofjz4i5j16zuv-1447
  bzrlib/_groupcompress_pyx.c    _groupcompress_pyx.c-20091205103605-6tjofjz4i5j16zuv-1332
  bzrlib/_knit_load_data_pyx.c   _knit_load_data_pyx.-20091205103605-6tjofjz4i5j16zuv-1435
  bzrlib/_known_graph_pyx.c      _known_graph_pyx.c-20091205103605-6tjofjz4i5j16zuv-1433
  bzrlib/_readdir_pyx.c          _readdir_pyx.c-20091205103605-6tjofjz4i5j16zuv-1320
  bzrlib/_readdir_pyx.pyx        _readdir_pyx.pyx-20091205103605-6tjofjz4i5j16zuv-1224
  bzrlib/_rio_pyx.c              _rio_pyx.c-20091205103605-6tjofjz4i5j16zuv-1378
  bzrlib/_simple_set_pyx.c       _simple_set_pyx.c-20091222115521-u3qk6az92df0gyfz-4
  bzrlib/builtins.py             builtins.py-20091205103605-6tjofjz4i5j16zuv-36
  bzrlib/bzrdir.py               bzrdir.py-20091205103605-6tjofjz4i5j16zuv-407
  bzrlib/clean_tree.py           clean_tree.py-20091205103605-6tjofjz4i5j16zuv-1297
  bzrlib/commands.py             commands.py-20091205103605-6tjofjz4i5j16zuv-40
  bzrlib/groupcompress.py        groupcompress.py-20091205103605-6tjofjz4i5j16zuv-1359
  bzrlib/lock.py                 lock.py-20091205103605-6tjofjz4i5j16zuv-54
  bzrlib/merge.py                merge.py-20091205103605-6tjofjz4i5j16zuv-57
  bzrlib/osutils.py              osutils.py-20091205103605-6tjofjz4i5j16zuv-62
  bzrlib/plugins/news_merge/__init__.py __init__.py-20100205213744-vmoj59e32ndsrgz3-12
  bzrlib/remote.py               remote.py-20091205103605-6tjofjz4i5j16zuv-808
  bzrlib/smart/medium.py         medium.py-20091205103605-6tjofjz4i5j16zuv-814
  bzrlib/switch.py               switch.py-20091205103605-6tjofjz4i5j16zuv-1067
  bzrlib/tests/__init__.py       __init__.py-20091205103605-6tjofjz4i5j16zuv-325
  bzrlib/tests/blackbox/test_clean_tree.py test_clean_tree.py-20091205103605-6tjofjz4i5j16zuv-1298
  bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20091205103605-6tjofjz4i5j16zuv-440
  bzrlib/tests/commands/__init__.py __init__.py-20091205103605-6tjofjz4i5j16zuv-942
  bzrlib/tests/per_repository_reference/__init__.py __init__.py-20091205103605-6tjofjz4i5j16zuv-1151
  bzrlib/tests/per_repository_reference/test_default_stacking.py test_default_stackin-20091205103605-6tjofjz4i5j16zuv-1322
  bzrlib/tests/per_workingtree/test_merge_from_branch.py test_merge_from_bran-20091205103605-6tjofjz4i5j16zuv-1475
  bzrlib/tests/test_osutils.py   test_osutils.py-20091205103605-6tjofjz4i5j16zuv-367
  bzrlib/tests/test_remote.py    test_remote.py-20091205103605-6tjofjz4i5j16zuv-828
  bzrlib/tests/test_switch.py    test_switch.py-20091205103605-6tjofjz4i5j16zuv-1060
  bzrlib/tests/test_win32utils.py test_win32utils.py-20091205103605-6tjofjz4i5j16zuv-949
  bzrlib/transport/__init__.py   __init__.py-20091205103605-6tjofjz4i5j16zuv-123
  bzrlib/ui/text.py              text.py-20091205103605-6tjofjz4i5j16zuv-402
  bzrlib/win32utils.py           win32utils.py-20091205103605-6tjofjz4i5j16zuv-787
  doc/developers/testing.txt     testing.txt-20091205103605-6tjofjz4i5j16zuv-1226
  doc/en/Makefile                makefile-20091205103605-6tjofjz4i5j16zuv-1615

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