Rev 4741: Merge bzr.dev resolve test conflict. in http://bazaar.launchpad.net/~jameinel/bzr/2.1-st-from-sequence

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.1-st-from-sequence

------------------------------------------------------------
revno: 4741 [merge]
revision-id: john at arbash-meinel.com-20091017003428-opg71qwkbzr3clko
parent: john at arbash-meinel.com-20091013180016-y9ciypkm8lor58fx
parent: pqm at pqm.ubuntu.com-20091016180433-a22cve9xzbdc0xa8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.1-st-from-sequence
timestamp: Fri 2009-10-16 19:34:28 -0500
message:
  Merge bzr.dev resolve test conflict.
added:
  bzrlib/static_tuple.py         static_tuple.py-20091012195926-qa7zh2stf4xtblm8-1
  bzrlib/tests/per_uifactory/    bzrlibtestsper_uifac-20090923023429-a6kukw4evi29ovza-1
  bzrlib/tests/per_uifactory/__init__.py __init__.py-20090923045301-o12zypjwsidxn2hy-1
modified:
  Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
  bzrlib/_bencode_pyx.pyx        bencode.pyx-20070806220735-j75g4ebfnado2i60-3
  bzrlib/_btree_serializer_pyx.pyx _parse_btree_c.pyx-20080703034413-3q25bklkenti3p8p-2
  bzrlib/_readdir_pyx.pyx        readdir.pyx-20060609152855-rm6v321vuaqyh9tu-1
  bzrlib/_simple_set_pyx.pyx     _static_tuple_intern-20091002053806-sid67p8spedru51w-1
  bzrlib/_static_tuple_c.c       _keys_type_c.c-20090908204220-aa346ccw4l37jzt7-1
  bzrlib/btree_index.py          index.py-20080624222253-p0x5f92uyh5hw734-7
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
  bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
  bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
  bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
  bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
  bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/test__simple_set.py test__static_tuple_i-20091002053806-sid67p8spedru51w-2
  bzrlib/tests/test__static_tuple.py test__keys_type.py-20090908204220-aa346ccw4l37jzt7-2
  bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
  bzrlib/tests/test_ui.py        test_ui.py-20051130162854-458e667a7414af09
  bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
  bzrlib/ui/__init__.py          ui.py-20050824083933-8cf663c763ba53a9
  bzrlib/ui/text.py              text.py-20051130153916-2e438cffc8afc478
  bzrlib/util/_bencode_py.py     bencode.py-20070220044742-sltr28q21w2wzlxi-1
  doc/en/user-guide/branching_a_project.txt branching_a_project.-20071122141511-0knao2lklsdsvb1q-2
  setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
-------------- next part --------------

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