Rev 6177: Merge trunk in file:///home/vila/src/bzr/861472-migrate-log-format/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/861472-migrate-log-format/

------------------------------------------------------------
revno: 6177 [merge]
revision-id: v.ladeuil+lp at free.fr-20110929162326-lugeczbgxo45kp0r
parent: v.ladeuil+lp at free.fr-20110929154326-hmpczhbxoywtxcn3
parent: pqm at pqm.ubuntu.com-20110929161631-39y752x3cwcljl5w
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 861472-migrate-log-format
timestamp: Thu 2011-09-29 18:23:26 +0200
message:
  Merge trunk
modified:
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
  bzrlib/_dirstate_helpers_py.py _dirstate_helpers_py-20070710145033-90nz6cqglsk150jy-1
  bzrlib/_dirstate_helpers_pyx.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
  bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
  bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
  bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
  bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
  bzrlib/library_state.py        library_state.py-20100625053036-962zdkiik8k6m5jx-1
  bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/test__dirstate_helpers.py test_dirstate_helper-20070504035751-jsbn00xodv0y1eve-2
  bzrlib/tests/test_commands.py  test_command.py-20051019190109-3b17be0f52eaa7a8
  bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
  bzrlib/tests/test_help.py      test_help.py-20070419045354-6q6rq15j9e2n5fna-1
  bzrlib/tests/test_options.py   testoptions.py-20051014093702-96457cfc86319a8f
  doc/en/release-notes/bzr-2.4.txt bzr2.4.txt-20110114053217-k7ym9jfz243fddjm-1
  doc/en/release-notes/bzr-2.5.txt bzr2.5.txt-20110708125756-587p0hpw7oke4h05-1
  tools/generate_docs.py         bzrinfogen.py-20051211224525-78e7c14f2c955e55
-------------- next part --------------

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