Rev 4980: Merge bzr.dev into cleanup in file:///home/vila/src/bzr/bugs/476293-log-check-ancestor/

Vincent Ladeuil v.ladeuil+lp at free.fr
Mon Feb 1 16:29:35 GMT 2010


At file:///home/vila/src/bzr/bugs/476293-log-check-ancestor/

------------------------------------------------------------
revno: 4980 [merge]
revision-id: v.ladeuil+lp at free.fr-20100201162934-0o7u265q5kseoa9h
parent: v.ladeuil+lp at free.fr-20100127082620-y0w3s3ld6ro1lva5
parent: pqm at pqm.ubuntu.com-20100201135324-cuhuolr97guf5xjp
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: cleanup
timestamp: Mon 2010-02-01 17:29:34 +0100
message:
  Merge bzr.dev into cleanup
removed:
  tools/biobench.py              biobench.py-20051101131608-0942e1592d0a8ba9
  tools/history2revfiles.py      history2revfiles.py-20050811180808-5a139eeb2c8ba9a2
modified:
  INSTALL                        INSTALL-20051019070340-4b27f2fb240c7943
  Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  README                         README-20050309040720-8f368abf9f346b9d
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
  bzrlib/doc_generate/autodoc_man.py bzrman.py-20050601153041-0ff7f74de456d15e
  bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
  bzrlib/foreign.py              foreign.py-20081112170002-olsxmandkk8qyfuq-1
  bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
  bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
  bzrlib/plugins/news_merge/__init__.py __init__.py-20100113072530-qj0i1em8th5pqhat-3
  bzrlib/plugins/news_merge/news_merge.py news_merge.py-20100118070008-sb1qe88ha64es7nv-1
  bzrlib/plugins/news_merge/tests/test_news_merge.py test_news_merge.py-20100120143539-19kxox9ma117rejo-1
  bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
  bzrlib/repofmt/groupcompress_repo.py repofmt.py-20080715094215-wp1qfvoo7093c8qr-1
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/tests/per_interrepository/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
  bzrlib/tests/per_merger.py     per_merger.py-20091216002111-bzeo6wx2tcfpuj67-1
  bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
  bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
  bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
  bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
  bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
  bzrlib/version.py              version.py-20060816024207-ves6ult9a11taj9t-1
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
  doc/developers/_templates/layout.html layout.html-20090907074245-4b4pm5q3bjw2pt27-1
  doc/en/_static/en/bzr-en-quick-reference.svg quickstartsummary.sv-20070813143223-5i7bgw7w8s7l3ae2-3
  doc/en/_templates/index.html   index.html-20090722133849-lus2rzwsmlhpgqhv-1
  doc/en/_templates/layout.html  layout.html-20090722133849-lus2rzwsmlhpgqhv-2
  doc/es/_static/es/bzr-es-quick-reference.svg referenciarapida.svg-20080506002609-y60mr4avuqwzlf4s-2
  doc/es/_templates/layout.html  layout.html-20090907060608-h0yq9dbax4xt09v5-1
  doc/ru/_static/ru/bzr-ru-quick-reference.svg quickstartsummary.sv-20080818031309-t3nyctvfbvfh4h2u-8
  doc/ru/_templates/layout.html  layout.html-20090908150437-pppigv0c2cky3qbk-1
  setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
  tools/win32/bzr_postinstall.py bzr_postinstall.py-20060622100836-b3yup582rt3y0nvm-6
-------------- next part --------------

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


More information about the bazaar-commits mailing list