Rev 6170: Merge trunk to resolve conflicts in file:///home/vila/src/bzr/bugs/863401-library-state/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/863401-library-state/

------------------------------------------------------------
revno: 6170 [merge]
revision-id: v.ladeuil+lp at free.fr-20111004113849-9os4pc4swnvdklxk
parent: v.ladeuil+lp at free.fr-20111003143445-s382csvk1613x0sp
parent: pqm at pqm.ubuntu.com-20111003151722-69gh10qcel6s5gfo
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 863401-library-state
timestamp: Tue 2011-10-04 13:38:49 +0200
message:
  Merge trunk to resolve conflicts
removed:
  bzrlib/tests/per_repository/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
  bzrlib/info.py                 info.py-20050323235939-6bbfe7d9700b0b9b
  bzrlib/plugins/weave_fmt/repository.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/blackbox/test_export_pot.py test_export_pot.py-20110927121342-eiuu7b24eawkfcut-1
  bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
  bzrlib/tests/blackbox/test_reference.py test_reference.py-20090428205614-7lo1hc2etrwd73x3-1
  bzrlib/tests/blackbox/test_tags.py test_tags.py-20070116132048-5h4qak2cm22jlb9e-1
  bzrlib/tests/blackbox/test_update.py test_update.py-20060212125639-c4dad1a5c56d5919
  bzrlib/tests/per_branch/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
  bzrlib/tests/per_branch/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
  bzrlib/tests/per_branch/test_break_lock.py test_break_lock.py-20060504111902-9aae411dbe9aadd2
  bzrlib/tests/per_bzrdir/__init__.py __init__.py-20100829134954-ax1jw4f3g61xgkfw-2
  bzrlib/tests/per_controldir/__init__.py __init__.py-20060131065642-34c39b54f42dd048
  bzrlib/tests/per_interrepository/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
  bzrlib/tests/per_repository/__init__.py __init__.py-20060131092037-9564957a7d4a841b
  bzrlib/tests/per_repository_vf/test_fileid_involved.py test_fileid_involved-20110907115746-pqcpktr9kdx020qm-1
  doc/en/release-notes/bzr-2.5.txt bzr2.5.txt-20110708125756-587p0hpw7oke4h05-1
-------------- next part --------------

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