Rev 4991: Merge bzr.dev 5007, resolve conflict, update NEWS in http://bzr.arbash-meinel.com/branches/bzr/jam-integration

John Arbash Meinel john at arbash-meinel.com
Thu Feb 4 16:07:26 GMT 2010


At http://bzr.arbash-meinel.com/branches/bzr/jam-integration

------------------------------------------------------------
revno: 4991 [merge]
revision-id: john at arbash-meinel.com-20100204160636-xqeuwz8bwt8bbts4
parent: michal at pdp-11-20100129120438-dypj90g17fzd9tol
parent: pqm at pqm.ubuntu.com-20100204143259-91x2d08a31yfeqnm
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2010-02-04 10:06:36 -0600
message:
  Merge bzr.dev 5007, resolve conflict, update NEWS
removed:
  contrib/fortune                fortune-20050510035517-ba20905f9be2c0c1
  tools/biobench.py              biobench.py-20051101131608-0942e1592d0a8ba9
  tools/history2revfiles.py      history2revfiles.py-20050811180808-5a139eeb2c8ba9a2
added:
  contrib/apport/                contribapport-20100131162357-aladkx1ilh730byb-1
  contrib/apport/README          readme-20100131163221-0u77xzj0p9auj54u-1
  contrib/apport/bzr.conf        bzr.conf-20100131163221-0u77xzj0p9auj54u-2
  contrib/apport/source_bzr.py   source_bzr.py-20100131163221-0u77xzj0p9auj54u-3
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/chk_map.py              chk_map.py-20081001014447-ue6kkuhofvdecvxa-1
  bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
  bzrlib/crash.py                crash.py-20090812083334-d6volool4lktdjcx-1
  bzrlib/doc_generate/autodoc_man.py bzrman.py-20050601153041-0ff7f74de456d15e
  bzrlib/export/dir_exporter.py  dir_exporter.py-20051114235828-b51397f56bc7b117
  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/log.py                  log.py-20050505065812-c40ce11702fe5fb1
  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/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/blackbox/test_bound_branches.py test_bound_branches.py-20051109215527-2373188ad566c205
  bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
  bzrlib/tests/features.py       features.py-20090820042958-jglgza3wrn03ha9e-1
  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/per_uifactory/__init__.py __init__.py-20090923045301-o12zypjwsidxn2hy-1
  bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
  bzrlib/tests/test_chk_map.py   test_chk_map.py-20081001014447-ue6kkuhofvdecvxa-2
  bzrlib/tests/test_crash.py     test_crash.py-20090820042958-jglgza3wrn03ha9e-2
  bzrlib/tests/test_export.py    test_export.py-20090220201010-tpbxssdnezsvu9pk-1
  bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
  bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
  bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
  bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
  bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
  bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
  bzrlib/transport/log.py        log.py-20080902041816-vh8x5yt5nvdzvew3-5
  bzrlib/ui/text.py              text.py-20051130153916-2e438cffc8afc478
  bzrlib/version.py              version.py-20060816024207-ves6ult9a11taj9t-1
  bzrlib/win32utils.py           win32console.py-20051021033308-123c6c929d04973d
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
  doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
  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 (3098 lines, the limit is 1000).


More information about the bazaar-commits mailing list