Rev 21: merge-upstream in file:///home/vila/src/bzr/packaging/maverick/mysru/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/packaging/maverick/mysru/

------------------------------------------------------------
revno: 21 [merge]
revision-id: v.ladeuil+lp at free.fr-20110316134743-9qhy9byl3ot9dwxq
parent: v.ladeuil+lp at free.fr-20110316134643-10nyabp1lukag3vc
parent: v.ladeuil+lp at free.fr-20110316134659-f6dmbez1118proy4
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: mysru
timestamp: Wed 2011-03-16 14:47:43 +0100
message:
  merge-upstream
added:
  bzrlib/tests/per_tree/test_is_executable.py test_is_executable.p-20110316134656-xbq0wtmqeo0bgpzr-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/_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/_patiencediff_c.c       _patiencediff_c.c-20091205103605-6tjofjz4i5j16zuv-986
  bzrlib/_readdir_pyx.c          _readdir_pyx.c-20091205103605-6tjofjz4i5j16zuv-1320
  bzrlib/_rio_pyx.c              _rio_pyx.c-20091205103605-6tjofjz4i5j16zuv-1378
  bzrlib/_simple_set_pyx.c       _simple_set_pyx.c-20091222115521-u3qk6az92df0gyfz-4
  bzrlib/commit.py               commit.py-20091205103605-6tjofjz4i5j16zuv-41
  bzrlib/conflicts.py            conflicts.py-20091205103605-6tjofjz4i5j16zuv-297
  bzrlib/doc_generate/autodoc_man.py autodoc_man.py-20091205103605-6tjofjz4i5j16zuv-1443
  bzrlib/errors.py               errors.py-20091205103605-6tjofjz4i5j16zuv-44
  bzrlib/help_topics/__init__.py __init__.py-20091205103605-6tjofjz4i5j16zuv-1091
  bzrlib/mutabletree.py          mutabletree.py-20091205103605-6tjofjz4i5j16zuv-679
  bzrlib/plugins/launchpad/lp_api.py lp_api.py-20100205213744-vmoj59e32ndsrgz3-4
  bzrlib/plugins/launchpad/lp_propose.py lp_propose.py-20100522085421-0jhpwipl64pa23ix-2
  bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20091205103605-6tjofjz4i5j16zuv-539
  bzrlib/plugins/launchpad/test_lp_service.py test_lp_service.py-20091205103605-6tjofjz4i5j16zuv-1094
  bzrlib/plugins/launchpad/test_register.py test_register.py-20091205103605-6tjofjz4i5j16zuv-540
  bzrlib/repofmt/pack_repo.py    pack_repo.py-20091205103605-6tjofjz4i5j16zuv-1001
  bzrlib/revisiontree.py         revisiontree.py-20091205103605-6tjofjz4i5j16zuv-575
  bzrlib/tests/__init__.py       __init__.py-20091205103605-6tjofjz4i5j16zuv-325
  bzrlib/tests/blackbox/test_add.py test_add.py-20091205103605-6tjofjz4i5j16zuv-577
  bzrlib/tests/blackbox/test_alias.py test_alias.py-20091205103605-6tjofjz4i5j16zuv-1158
  bzrlib/tests/blackbox/test_commit.py test_commit.py-20091205103605-6tjofjz4i5j16zuv-426
  bzrlib/tests/blackbox/test_conflicts.py test_conflicts.py-20091205103605-6tjofjz4i5j16zuv-427
  bzrlib/tests/blackbox/test_export.py test_export.py-20091205103605-6tjofjz4i5j16zuv-330
  bzrlib/tests/blackbox/test_tags.py test_tags.py-20091205103605-6tjofjz4i5j16zuv-754
  bzrlib/tests/features.py       features.py-20091205103605-6tjofjz4i5j16zuv-1609
  bzrlib/tests/per_lock/test_lock.py test_lock.py-20091205103605-6tjofjz4i5j16zuv-802
  bzrlib/tests/per_tree/__init__.py __init__.py-20091205103605-6tjofjz4i5j16zuv-1513
  bzrlib/tests/test_conflicts.py test_conflicts.py-20091205103605-6tjofjz4i5j16zuv-350
  bzrlib/tests/test_errors.py    test_errors.py-20091205103605-6tjofjz4i5j16zuv-462
  bzrlib/tests/test_http.py      test_http.py-20091205103605-6tjofjz4i5j16zuv-356
  bzrlib/tests/test_knit.py      test_knit.py-20091205103605-6tjofjz4i5j16zuv-500
  bzrlib/tests/test_lockdir.py   test_lockdir.py-20091205103605-6tjofjz4i5j16zuv-464
  bzrlib/tests/test_osutils.py   test_osutils.py-20091205103605-6tjofjz4i5j16zuv-367
  bzrlib/tests/test_selftest.py  test_selftest.py-20091205103605-6tjofjz4i5j16zuv-378
  bzrlib/tests/test_setup.py     test_setup.py-20091205103605-6tjofjz4i5j16zuv-379
  bzrlib/tests/test_transform.py test_transform.py-20091205103605-6tjofjz4i5j16zuv-467
  bzrlib/tests/test_workingtree.py test_workingtree.py-20091205103605-6tjofjz4i5j16zuv-396
  bzrlib/transform.py            transform.py-20091205103605-6tjofjz4i5j16zuv-474
  bzrlib/transport/http/_pycurl.py _pycurl.py-20091205103605-6tjofjz4i5j16zuv-505
  bzrlib/transport/http/_urllib.py _urllib.py-20091205103605-6tjofjz4i5j16zuv-506
  bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20091205103605-6tjofjz4i5j16zuv-730
  bzrlib/transport/ssh.py        ssh.py-20091205103605-6tjofjz4i5j16zuv-696
  bzrlib/workingtree_4.py        workingtree_4.py-20091205103605-6tjofjz4i5j16zuv-788
  debian/changelog               changelog-20091205103605-6tjofjz4i5j16zuv-268
  doc/developers/bug-handling.txt bughandling.txt-20091205103605-6tjofjz4i5j16zuv-1564
  doc/developers/content-filtering.txt contentfiltering.txt-20091205103605-6tjofjz4i5j16zuv-1603
  doc/developers/contribution-quickstart.txt contributionquicksta-20100205213744-vmoj59e32ndsrgz3-44
  doc/developers/ec2.txt         ec2.txt-20091205103605-6tjofjz4i5j16zuv-1364
  doc/developers/releasing.txt   releasing.txt-20091205103605-6tjofjz4i5j16zuv-1115
  doc/en/user-guide/branching_a_project.txt branching_a_project.-20091205103605-6tjofjz4i5j16zuv-1049
  doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20091205103605-6tjofjz4i5j16zuv-1046
  doc/en/user-guide/hooks.txt    hooks.txt-20091205103605-6tjofjz4i5j16zuv-969
  doc/en/user-guide/plugins.txt  plugins.txt-20091205103605-6tjofjz4i5j16zuv-904
  doc/en/user-guide/sending_changes.txt sending_changes.txt-20091205103605-6tjofjz4i5j16zuv-1014
  doc/en/user-guide/setting_up_email.txt setting_up_email.txt-20091205103605-6tjofjz4i5j16zuv-902
  doc/en/user-guide/specifying_revisions.txt specifying_revisions-20091205103605-6tjofjz4i5j16zuv-903
  doc/en/user-guide/version_info.txt version_info.txt-20091205103605-6tjofjz4i5j16zuv-909
  doc/en/user-guide/writing_a_plugin.txt writing_a_plugin.txt-20091205103605-6tjofjz4i5j16zuv-1007
  doc/en/whats-new/whats-new-in-2.1.txt whatsnewin2.1.txt-20100326211300-qanfffzc3bijvg26-27
  doc/en/whats-new/whats-new-in-2.2.txt whatsnewin2.2.txt-20100522085421-0jhpwipl64pa23ix-14
  doc/ja/user-reference/index.txt index.txt-20091222115521-u3qk6az92df0gyfz-93
  setup.py                       setup.py-20091205103605-6tjofjz4i5j16zuv-252
  tools/check-newsbugs.py        checknewsbugs.py-20091205103605-6tjofjz4i5j16zuv-1365
-------------- next part --------------

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