Rev 4234: Merge bzr.dev in http://people.ubuntu.com/~robertc/baz2.0/pending/RemoteBranchConfig
Robert Collins
robertc at robertcollins.net
Fri Apr 3 02:05:27 BST 2009
At http://people.ubuntu.com/~robertc/baz2.0/pending/RemoteBranchConfig
------------------------------------------------------------
revno: 4234
revision-id: robertc at robertcollins.net-20090403010508-dyujd8cj4sab3uh7
parent: robertc at robertcollins.net-20090403003753-0479w1mew25mfwkf
parent: pqm at pqm.ubuntu.com-20090402163502-ryn8zr2giilw5bki
committer: Robert Collins <robertc at robertcollins.net>
branch nick: RemoteBranchConfig
timestamp: Fri 2009-04-03 12:05:08 +1100
message:
Merge bzr.dev
removed:
bzrlib/tests/blackbox/test_guess_renames.py test_guess_renames.p-20090312063936-bqdtxr0r3md3jc00-1
added:
bzrlib/filters/eol.py eol.py-20090327060429-todzdjmqt3bpv5r8-1
bzrlib/help_topics/en/eol.txt eol.txt-20090327060429-todzdjmqt3bpv5r8-3
bzrlib/tests/test_eol_filters.py test_eol_filters.py-20090327060429-todzdjmqt3bpv5r8-2
bzrlib/tests/workingtree_implementations/test_eol_conversion.py test_eol_conversion.-20090327060429-todzdjmqt3bpv5r8-4
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/help_topics/en/rules.txt rules.txt-20080516063844-ghr5l6pvvrhiycun-1
bzrlib/rename_map.py rename_map.py-20090312140439-xexkkmjlg2enbohc-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
bzrlib/tests/blackbox/test_filtered_view_ops.py test_filtered_view_o-20081110012645-5t7ogtola0l33lkg-1
bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
bzrlib/tests/blackbox/test_view.py test_view.py-20080731135100-66o8o32heop7augi-1
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_rename_map.py test_rename_map.py-20090312140439-xexkkmjlg2enbohc-2
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
bzrlib/xml_serializer.py xml.py-20050309040759-57d51586fdec365d
doc/en/user-guide/filtered_views.txt filtered_views.txt-20090226100856-a16ba1v97v91ru58-1
tools/win32/build_release.py build_release.py-20081105204355-2ghh5cv01v1x4rzz-1
------------------------------------------------------------
revno: 4226.1.15
revision-id: pqm at pqm.ubuntu.com-20090402163502-ryn8zr2giilw5bki
parent: pqm at pqm.ubuntu.com-20090402154740-0h1xz7luyp8mb2lz
parent: aaron at aaronbentley.com-20090401215909-zysl5d9v78tg9ehd
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-04-02 17:35:02 +0100
message:
(abentley) Change guess-renames to mv --auto, add --dry-run
removed:
bzrlib/tests/blackbox/test_guess_renames.py test_guess_renames.p-20090312063936-bqdtxr0r3md3jc00-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/rename_map.py rename_map.py-20090312140439-xexkkmjlg2enbohc-1
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
bzrlib/tests/test_rename_map.py test_rename_map.py-20090312140439-xexkkmjlg2enbohc-2
------------------------------------------------------------
revno: 3193.8.39
revision-id: aaron at aaronbentley.com-20090401215909-zysl5d9v78tg9ehd
parent: aaron at aaronbentley.com-20090401203316-si0w1d1wbc8bapay
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: guess-renames
timestamp: Wed 2009-04-01 17:59:09 -0400
message:
Remove guess-renames command
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 3193.8.38
revision-id: aaron at aaronbentley.com-20090401203316-si0w1d1wbc8bapay
parent: aaron at aaronbentley.com-20090401203051-d69lplsnxovk6nxi
parent: pqm at pqm.ubuntu.com-20090401151438-hqulqoazddtacbls
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: guess-renames
timestamp: Wed 2009-04-01 16:33:16 -0400
message:
Merge bzr.dev into guess-renames
added:
doc/developers/improved_chk_index.txt improved_chk_index.t-20090320211430-odgus43a7wgoi0ik-1
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/counted_lock.py counted_lock.py-20070502135927-7dk86io3ok7ctx6k-1
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/filters/__init__.py __init__.py-20080416080515-mkxl29amuwrf6uir-2
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/lru_cache.py lru_cache.py-20070119165515-tlw203kuwh0id5gv-1
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/smtp_connection.py smtp_connection.py-20070618204456-nu6wag1ste4biuk2-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/blackbox/test_filtered_view_ops.py test_filtered_view_o-20081110012645-5t7ogtola0l33lkg-1
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_view.py test_view.py-20080731135100-66o8o32heop7augi-1
bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_counted_lock.py test_counted_lock.py-20070502135927-7dk86io3ok7ctx6k-2
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_filters.py test_filters.py-20080417120614-tc3zok0vvvprsc99-1
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_lru_cache.py test_lru_cache.py-20070119165535-hph6rk4h9rzy4180-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/test_smart_request.py test_smart_request.p-20090211070731-o38wayv3asm25d6a-1
bzrlib/tests/test_smtp_connection.py test_smtp_connection-20070618204509-wuyxc0r0ztrecv7e-1
bzrlib/tests/test_source.py test_source.py-20051207061333-a58dea6abecc030d
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/performance-contributing.txt performancecontribut-20070621063612-ac4zhhagjzkr21qp-1
doc/developers/planned-change-integration.txt plannedchangeintegra-20070619004702-i1b3ccamjtfaoq6w-1
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
doc/developers/revision-properties.txt revisionproperties.t-20070807133526-w57m8zv5o7t5kugm-1
doc/en/user-guide/browsing_history.txt browsing_history.txt-20071121073725-0corxykv5irjal00-2
doc/en/user-guide/filtered_views.txt filtered_views.txt-20090226100856-a16ba1v97v91ru58-1
------------------------------------------------------------
revno: 3193.8.37
revision-id: aaron at aaronbentley.com-20090401203051-d69lplsnxovk6nxi
parent: aaron at aaronbentley.com-20090401200852-fk0duxmcy6sbxfuz
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: guess-renames
timestamp: Wed 2009-04-01 16:30:51 -0400
message:
Finish up conversion to mv --auto.
removed:
bzrlib/tests/blackbox/test_guess_renames.py test_guess_renames.p-20090312063936-bqdtxr0r3md3jc00-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
------------------------------------------------------------
revno: 3193.8.36
revision-id: aaron at aaronbentley.com-20090401200852-fk0duxmcy6sbxfuz
parent: aaron at aaronbentley.com-20090401195927-chkayyap0yl8wmnb
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: guess-renames
timestamp: Wed 2009-04-01 16:08:52 -0400
message:
Get remaining behaviour under test.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
------------------------------------------------------------
revno: 3193.8.35
revision-id: aaron at aaronbentley.com-20090401195927-chkayyap0yl8wmnb
parent: aaron at aaronbentley.com-20090330205942-irvhmm42k6d4kfdd
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: guess-renames
timestamp: Wed 2009-04-01 15:59:27 -0400
message:
Implement mv --auto.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
------------------------------------------------------------
revno: 3193.8.34
revision-id: aaron at aaronbentley.com-20090330205942-irvhmm42k6d4kfdd
parent: aaron at aaronbentley.com-20090324154732-bwkvi4dx3o90a7dq
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: guess-renames
timestamp: Mon 2009-03-30 16:59:42 -0400
message:
Add tests of guess_renames output.
modified:
bzrlib/tests/test_rename_map.py test_rename_map.py-20090312140439-xexkkmjlg2enbohc-2
------------------------------------------------------------
revno: 3193.8.33
revision-id: aaron at aaronbentley.com-20090324154732-bwkvi4dx3o90a7dq
parent: aaron at aaronbentley.com-20090324125405-dz57ar35gw5m19y5
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: guess-renames
timestamp: Tue 2009-03-24 11:47:32 -0400
message:
Add output, emit minimal inventory delta.
modified:
bzrlib/rename_map.py rename_map.py-20090312140439-xexkkmjlg2enbohc-1
------------------------------------------------------------
revno: 4226.1.14
revision-id: pqm at pqm.ubuntu.com-20090402154740-0h1xz7luyp8mb2lz
parent: pqm at pqm.ubuntu.com-20090402144549-a1o7lbd8lp64qxnl
parent: v.ladeuil+lp at free.fr-20090402135702-z4o6v81p439b0ey8
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-04-02 16:47:40 +0100
message:
(vila) Stop-gap fix for Repository.get_revision_xml
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 4226.10.1
revision-id: v.ladeuil+lp at free.fr-20090402135702-z4o6v81p439b0ey8
parent: pqm at pqm.ubuntu.com-20090402093220-mqwls6dsncdfegbq
parent: v.ladeuil+lp at free.fr-20090402102108-g0xrarrluckwgxvs
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Thu 2009-04-02 15:57:02 +0200
message:
Stop-gap fix for Repository.get_revision_xml
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 4226.9.1
revision-id: v.ladeuil+lp at free.fr-20090402102108-g0xrarrluckwgxvs
parent: pqm at pqm.ubuntu.com-20090401151438-hqulqoazddtacbls
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 4230
timestamp: Thu 2009-04-02 12:21:08 +0200
message:
Stop-gap fix for Repository.get_revision_xml.
* bzrlib/repository.py:
(Repository.get_revision_xml): Revert previous change as it breaks
the test suite with LANG=en_US.UTF-8.
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 4226.1.13
revision-id: pqm at pqm.ubuntu.com-20090402144549-a1o7lbd8lp64qxnl
parent: pqm at pqm.ubuntu.com-20090402135806-w2vi86mmi1s39b4h
parent: jelmer at samba.org-20090328161036-qz5jljmaehkux5p3
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-04-02 15:45:49 +0100
message:
(Jelmer) Include bzr-rebase in the Windows installer.
modified:
tools/win32/build_release.py build_release.py-20081105204355-2ghh5cv01v1x4rzz-1
------------------------------------------------------------
revno: 4062.3.2
revision-id: jelmer at samba.org-20090328161036-qz5jljmaehkux5p3
parent: jelmer at samba.org-20090227221353-uixn1vo7bfbanq27
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: windows-rebase
timestamp: Sat 2009-03-28 17:10:36 +0100
message:
Use newer bzr-rebase.
modified:
tools/win32/build_release.py build_release.py-20081105204355-2ghh5cv01v1x4rzz-1
------------------------------------------------------------
revno: 4062.3.1
revision-id: jelmer at samba.org-20090227221353-uixn1vo7bfbanq27
parent: pqm at pqm.ubuntu.com-20090227055829-spbhpi4ccodki2r4
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: windows-rebase
timestamp: Fri 2009-02-27 23:13:53 +0100
message:
Provide bzr-rebase in the windows installer.
modified:
tools/win32/build_release.py build_release.py-20081105204355-2ghh5cv01v1x4rzz-1
------------------------------------------------------------
revno: 4226.1.12
revision-id: pqm at pqm.ubuntu.com-20090402135806-w2vi86mmi1s39b4h
parent: pqm at pqm.ubuntu.com-20090402093220-mqwls6dsncdfegbq
parent: jelmer at samba.org-20090331203433-ncsd0sar9rc7wkqd
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-04-02 14:58:06 +0100
message:
(Jelmer) Make function for escaping invalid XML characters public.
modified:
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/xml_serializer.py xml.py-20050309040759-57d51586fdec365d
------------------------------------------------------------
revno: 4222.1.1
revision-id: jelmer at samba.org-20090331203433-ncsd0sar9rc7wkqd
parent: pqm at pqm.ubuntu.com-20090331122525-77wqe7gqpr2gcl7u
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: escape-commit-message
timestamp: Tue 2009-03-31 22:34:33 +0200
message:
Make function for escaping invalid XML characters public.
modified:
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/xml_serializer.py xml.py-20050309040759-57d51586fdec365d
------------------------------------------------------------
revno: 4226.1.11
revision-id: pqm at pqm.ubuntu.com-20090402093220-mqwls6dsncdfegbq
parent: pqm at pqm.ubuntu.com-20090402084546-7i3as38i7z2iiuxd
parent: v.ladeuil+lp at free.fr-20090402082830-d7kqokbf1xlzkc5j
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-04-02 10:32:20 +0100
message:
(vila) Fix selftest --parallel result handling (for real)
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 4226.6.2
revision-id: v.ladeuil+lp at free.fr-20090402082830-d7kqokbf1xlzkc5j
parent: v.ladeuil+lp at free.fr-20090402063347-i4e7m5yaabgz052f
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: integration
timestamp: Thu 2009-04-02 10:28:30 +0200
message:
That line is jinxed
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 4226.1.10
revision-id: pqm at pqm.ubuntu.com-20090402084546-7i3as38i7z2iiuxd
parent: pqm at pqm.ubuntu.com-20090402072138-cqrfqyky0dnrqnbi
parent: ian.clatworthy at canonical.com-20090402074542-a3o4rm7lne2mh478
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-04-02 09:45:46 +0100
message:
(ianc) fix typo in rules help (Michael B. Trausch)
modified:
bzrlib/help_topics/en/rules.txt rules.txt-20080516063844-ghr5l6pvvrhiycun-1
------------------------------------------------------------
revno: 4226.8.1
revision-id: ian.clatworthy at canonical.com-20090402074542-a3o4rm7lne2mh478
parent: pqm at pqm.ubuntu.com-20090402072138-cqrfqyky0dnrqnbi
parent: mike at trausch.us-20090401164135-mjgouxwhmz6yx2qf
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: ianc-integration
timestamp: Thu 2009-04-02 17:45:42 +1000
message:
fix typo in rules help (Michael B. Trausch)
modified:
bzrlib/help_topics/en/rules.txt rules.txt-20080516063844-ghr5l6pvvrhiycun-1
------------------------------------------------------------
revno: 4226.7.1
revision-id: mike at trausch.us-20090401164135-mjgouxwhmz6yx2qf
parent: pqm at pqm.ubuntu.com-20090401063434-motksin95y4undi6
committer: Michael B. Trausch <mike at trausch.us>
branch nick: bzr
timestamp: Wed 2009-04-01 12:41:35 -0400
message:
Trivial typo fix.
modified:
bzrlib/help_topics/en/rules.txt rules.txt-20080516063844-ghr5l6pvvrhiycun-1
------------------------------------------------------------
revno: 4226.1.9
revision-id: pqm at pqm.ubuntu.com-20090402072138-cqrfqyky0dnrqnbi
parent: pqm at pqm.ubuntu.com-20090402061945-oh2qwvhwlpbeyyx4
parent: v.ladeuil+lp at free.fr-20090402063347-i4e7m5yaabgz052f
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-04-02 08:21:38 +0100
message:
(vila) Fix selftest --parallel result handling
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 4226.6.1
revision-id: v.ladeuil+lp at free.fr-20090402063347-i4e7m5yaabgz052f
parent: pqm at pqm.ubuntu.com-20090402061945-oh2qwvhwlpbeyyx4
parent: v.ladeuil+lp at free.fr-20090402062902-xenjze5i1fzv8xu1
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: integration
timestamp: Thu 2009-04-02 08:33:47 +0200
message:
(vila) Fix selftest --parallel result handling
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 4226.5.2
revision-id: v.ladeuil+lp at free.fr-20090402062902-xenjze5i1fzv8xu1
parent: v.ladeuil+lp at free.fr-20090401104418-tev44lw48rzxcfw0
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: parallel-selftest
timestamp: Thu 2009-04-02 08:29:02 +0200
message:
Fixed as per Robert's review.
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 4226.5.1
revision-id: v.ladeuil+lp at free.fr-20090401104418-tev44lw48rzxcfw0
parent: pqm at pqm.ubuntu.com-20090401063434-motksin95y4undi6
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: parallel-selftest
timestamp: Wed 2009-04-01 12:44:18 +0200
message:
Fix selftest --parallel for ConcurrentTestSuite uses.
* bzrlib/tests/__init__.py:
(TextTestRunner.run): The test type matters here, not the
result (which is set just above).
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 4226.1.8
revision-id: pqm at pqm.ubuntu.com-20090402061945-oh2qwvhwlpbeyyx4
parent: pqm at pqm.ubuntu.com-20090402053229-w8oy2wc2dpahfph9
parent: robertc at robertcollins.net-20090402050517-4m3m3fq2ttfvwoi0
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-04-02 07:19:45 +0100
message:
(robertc) Reinstate the use of the Branch.get_config_file smart verb.
(Robert Collins, Andrew Bennetts)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 4231.1.2
revision-id: robertc at robertcollins.net-20090402050517-4m3m3fq2ttfvwoi0
parent: robertc at robertcollins.net-20090402040123-x690lf0614rqgypb
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2009-04-02 16:05:17 +1100
message:
Alter test_config.FakeBranch in accordance with the Branch change to have a _get_config.
modified:
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
------------------------------------------------------------
revno: 4231.1.1
revision-id: robertc at robertcollins.net-20090402040123-x690lf0614rqgypb
parent: robertc at robertcollins.net-20090402033730-i0qrdiqnldwqke02
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2009-04-02 15:01:23 +1100
message:
Revert an overly optimistic change to the Remote acceptance tests - they are not improved yet.
modified:
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
------------------------------------------------------------
revno: 4226.1.7
revision-id: pqm at pqm.ubuntu.com-20090402053229-w8oy2wc2dpahfph9
parent: pqm at pqm.ubuntu.com-20090401151438-hqulqoazddtacbls
parent: ian.clatworthy at canonical.com-20090402041211-jl6u7r4r5inw9p2h
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-04-02 06:32:29 +0100
message:
Integrated EOL conversion support (Ian Clatworthy)
added:
bzrlib/filters/eol.py eol.py-20090327060429-todzdjmqt3bpv5r8-1
bzrlib/help_topics/en/eol.txt eol.txt-20090327060429-todzdjmqt3bpv5r8-3
bzrlib/tests/test_eol_filters.py test_eol_filters.py-20090327060429-todzdjmqt3bpv5r8-2
bzrlib/tests/workingtree_implementations/test_eol_conversion.py test_eol_conversion.-20090327060429-todzdjmqt3bpv5r8-4
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
------------------------------------------------------------
revno: 4226.4.1
revision-id: ian.clatworthy at canonical.com-20090402041211-jl6u7r4r5inw9p2h
parent: pqm at pqm.ubuntu.com-20090401151438-hqulqoazddtacbls
parent: ian.clatworthy at canonical.com-20090402022228-eez3xvn4gvs3xbva
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: ianc-integration
timestamp: Thu 2009-04-02 14:12:11 +1000
message:
Integrated EOL conversion support (Ian Clatworthy)
added:
bzrlib/filters/eol.py eol.py-20090327060429-todzdjmqt3bpv5r8-1
bzrlib/help_topics/en/eol.txt eol.txt-20090327060429-todzdjmqt3bpv5r8-3
bzrlib/tests/test_eol_filters.py test_eol_filters.py-20090327060429-todzdjmqt3bpv5r8-2
bzrlib/tests/workingtree_implementations/test_eol_conversion.py test_eol_conversion.-20090327060429-todzdjmqt3bpv5r8-4
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
------------------------------------------------------------
revno: 4208.4.8
revision-id: ian.clatworthy at canonical.com-20090402022228-eez3xvn4gvs3xbva
parent: ian.clatworthy at canonical.com-20090401045146-vh1wo8t27o1o4lzp
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.eol
timestamp: Thu 2009-04-02 12:22:28 +1000
message:
more help tweaks
modified:
bzrlib/help_topics/en/eol.txt eol.txt-20090327060429-todzdjmqt3bpv5r8-3
------------------------------------------------------------
revno: 4208.4.7
revision-id: ian.clatworthy at canonical.com-20090401045146-vh1wo8t27o1o4lzp
parent: ian.clatworthy at canonical.com-20090401023815-772ygk8xx8ml4e31
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.eol
timestamp: Wed 2009-04-01 14:51:46 +1000
message:
tweak eol names based on mailing list discussion
modified:
bzrlib/filters/eol.py eol.py-20090327060429-todzdjmqt3bpv5r8-1
bzrlib/help_topics/en/eol.txt eol.txt-20090327060429-todzdjmqt3bpv5r8-3
bzrlib/tests/workingtree_implementations/test_eol_conversion.py test_eol_conversion.-20090327060429-todzdjmqt3bpv5r8-4
------------------------------------------------------------
revno: 4208.4.6
revision-id: ian.clatworthy at canonical.com-20090401023815-772ygk8xx8ml4e31
parent: ian.clatworthy at canonical.com-20090329010922-5cf8sgtz2cvs8k0m
parent: pqm at pqm.ubuntu.com-20090401021937-weq1st849rreuonn
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.eol
timestamp: Wed 2009-04-01 12:38:15 +1000
message:
merge bzr.dev r4225
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/filters/__init__.py __init__.py-20080416080515-mkxl29amuwrf6uir-2
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/blackbox/test_filtered_view_ops.py test_filtered_view_o-20081110012645-5t7ogtola0l33lkg-1
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_filters.py test_filters.py-20080417120614-tc3zok0vvvprsc99-1
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/en/user-guide/browsing_history.txt browsing_history.txt-20071121073725-0corxykv5irjal00-2
------------------------------------------------------------
revno: 4208.4.5
revision-id: ian.clatworthy at canonical.com-20090329010922-5cf8sgtz2cvs8k0m
parent: ian.clatworthy at canonical.com-20090328142427-xgi03v1s0sm1o0cd
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.eol
timestamp: Sun 2009-03-29 11:09:22 +1000
message:
add lf-always and crlf-always
modified:
bzrlib/filters/eol.py eol.py-20090327060429-todzdjmqt3bpv5r8-1
bzrlib/help_topics/en/eol.txt eol.txt-20090327060429-todzdjmqt3bpv5r8-3
bzrlib/tests/workingtree_implementations/test_eol_conversion.py test_eol_conversion.-20090327060429-todzdjmqt3bpv5r8-4
------------------------------------------------------------
revno: 4208.4.4
revision-id: ian.clatworthy at canonical.com-20090328142427-xgi03v1s0sm1o0cd
parent: ian.clatworthy at canonical.com-20090328080911-fwbaaay1qldnvc3f
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.eol
timestamp: Sun 2009-03-29 00:24:27 +1000
message:
unix/window -> cr/crlf based on mailing list feedback
modified:
bzrlib/filters/eol.py eol.py-20090327060429-todzdjmqt3bpv5r8-1
bzrlib/help_topics/en/eol.txt eol.txt-20090327060429-todzdjmqt3bpv5r8-3
bzrlib/tests/workingtree_implementations/test_eol_conversion.py test_eol_conversion.-20090327060429-todzdjmqt3bpv5r8-4
------------------------------------------------------------
revno: 4208.4.3
revision-id: ian.clatworthy at canonical.com-20090328080911-fwbaaay1qldnvc3f
parent: ian.clatworthy at canonical.com-20090327142926-ue4pibsolzsd847l
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.eol
timestamp: Sat 2009-03-28 18:09:11 +1000
message:
rename dos to windows
modified:
bzrlib/filters/eol.py eol.py-20090327060429-todzdjmqt3bpv5r8-1
bzrlib/help_topics/en/eol.txt eol.txt-20090327060429-todzdjmqt3bpv5r8-3
bzrlib/tests/workingtree_implementations/test_eol_conversion.py test_eol_conversion.-20090327060429-todzdjmqt3bpv5r8-4
------------------------------------------------------------
revno: 4208.4.2
revision-id: ian.clatworthy at canonical.com-20090327142926-ue4pibsolzsd847l
parent: ian.clatworthy at canonical.com-20090327142225-0pvkc1n021nw8301
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.eol
timestamp: Sat 2009-03-28 00:29:26 +1000
message:
tweak help
modified:
bzrlib/help_topics/en/eol.txt eol.txt-20090327060429-todzdjmqt3bpv5r8-3
------------------------------------------------------------
revno: 4208.4.1
revision-id: ian.clatworthy at canonical.com-20090327142225-0pvkc1n021nw8301
parent: pqm at pqm.ubuntu.com-20090326131816-4nzmlssnd4huc5cu
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.eol
timestamp: Sat 2009-03-28 00:22:25 +1000
message:
eol conversion support
added:
bzrlib/filters/eol.py eol.py-20090327060429-todzdjmqt3bpv5r8-1
bzrlib/help_topics/en/eol.txt eol.txt-20090327060429-todzdjmqt3bpv5r8-3
bzrlib/tests/test_eol_filters.py test_eol_filters.py-20090327060429-todzdjmqt3bpv5r8-2
bzrlib/tests/workingtree_implementations/test_eol_conversion.py test_eol_conversion.-20090327060429-todzdjmqt3bpv5r8-4
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 4226.1.6
revision-id: pqm at pqm.ubuntu.com-20090401151438-hqulqoazddtacbls
parent: pqm at pqm.ubuntu.com-20090401121940-3oygnqkdl889mo02
parent: andrew.bennetts at canonical.com-20090326005946-wyn48x31d5tsloi9
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-04-01 16:14:38 +0100
message:
(andrew) Don't use get_revision_xml when writing a bundle,
instead get all the revisions together.
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 4202.3.2
revision-id: andrew.bennetts at canonical.com-20090326005946-wyn48x31d5tsloi9
parent: andrew.bennetts at canonical.com-20090325231511-7bp035hjp2wd1maa
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr-send-tweak
timestamp: Thu 2009-03-26 11:59:46 +1100
message:
Remove unused cStringIO import.
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 4202.3.1
revision-id: andrew.bennetts at canonical.com-20090325231511-7bp035hjp2wd1maa
parent: pqm at pqm.ubuntu.com-20090325042012-23a6pm0mraw7g2kg
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr-send-tweak
timestamp: Thu 2009-03-26 10:15:11 +1100
message:
Don't use get_revision_xml when writing a bundle, instead get all the revisions together.
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 4226.1.5
revision-id: pqm at pqm.ubuntu.com-20090401121940-3oygnqkdl889mo02
parent: pqm at pqm.ubuntu.com-20090401111640-wnn3068uv1nc8lhj
parent: v.ladeuil+lp at free.fr-20090401113154-4co2i24ey0ka9qby
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-04-01 13:19:40 +0100
message:
(vila) Desambiguate comment before it became totally obscure.
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 4226.3.1
revision-id: v.ladeuil+lp at free.fr-20090401113154-4co2i24ey0ka9qby
parent: pqm at pqm.ubuntu.com-20090401063434-motksin95y4undi6
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: various
timestamp: Wed 2009-04-01 13:31:54 +0200
message:
Desambiguate comment before it became totally obscure.
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 4226.1.4
revision-id: pqm at pqm.ubuntu.com-20090401111640-wnn3068uv1nc8lhj
parent: pqm at pqm.ubuntu.com-20090401063434-motksin95y4undi6
parent: ian.clatworthy at canonical.com-20090401102233-nb0x50guwk2cmlk4
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-04-01 12:16:40 +0100
message:
1.14 formats (Ian Clatworthy)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
bzrlib/tests/blackbox/test_filtered_view_ops.py test_filtered_view_o-20081110012645-5t7ogtola0l33lkg-1
bzrlib/tests/blackbox/test_view.py test_view.py-20080731135100-66o8o32heop7augi-1
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/en/user-guide/filtered_views.txt filtered_views.txt-20090226100856-a16ba1v97v91ru58-1
------------------------------------------------------------
revno: 4226.2.1
revision-id: ian.clatworthy at canonical.com-20090401102233-nb0x50guwk2cmlk4
parent: pqm at pqm.ubuntu.com-20090401063434-motksin95y4undi6
parent: ian.clatworthy at canonical.com-20090331141327-x4rzqnx90pd1nsuc
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: ianc-integration
timestamp: Wed 2009-04-01 20:22:33 +1000
message:
1.14 formats (Ian Clatworthy)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
bzrlib/tests/blackbox/test_filtered_view_ops.py test_filtered_view_o-20081110012645-5t7ogtola0l33lkg-1
bzrlib/tests/blackbox/test_view.py test_view.py-20080731135100-66o8o32heop7augi-1
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/en/user-guide/filtered_views.txt filtered_views.txt-20090226100856-a16ba1v97v91ru58-1
------------------------------------------------------------
revno: 4210.4.3
revision-id: ian.clatworthy at canonical.com-20090331141327-x4rzqnx90pd1nsuc
parent: ian.clatworthy at canonical.com-20090331141227-8dr1s44x16j7dina
parent: pqm at pqm.ubuntu.com-20090331100842-0x25r10mpiyxv5d9
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.114
timestamp: Wed 2009-04-01 00:13:27 +1000
message:
merge bzr.dev r4221
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/filters/__init__.py __init__.py-20080416080515-mkxl29amuwrf6uir-2
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/blackbox/test_filtered_view_ops.py test_filtered_view_o-20081110012645-5t7ogtola0l33lkg-1
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_filters.py test_filters.py-20080417120614-tc3zok0vvvprsc99-1
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/en/user-guide/browsing_history.txt browsing_history.txt-20071121073725-0corxykv5irjal00-2
------------------------------------------------------------
revno: 4210.4.2
revision-id: ian.clatworthy at canonical.com-20090331141227-8dr1s44x16j7dina
parent: ian.clatworthy at canonical.com-20090328012754-et08kurwwapknnbz
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.114
timestamp: Wed 2009-04-01 00:12:27 +1000
message:
split filtered views support out into WorkingTreeFormat6
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
bzrlib/tests/blackbox/test_filtered_view_ops.py test_filtered_view_o-20081110012645-5t7ogtola0l33lkg-1
bzrlib/tests/blackbox/test_view.py test_view.py-20080731135100-66o8o32heop7augi-1
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/en/user-guide/filtered_views.txt filtered_views.txt-20090226100856-a16ba1v97v91ru58-1
------------------------------------------------------------
revno: 4210.4.1
revision-id: ian.clatworthy at canonical.com-20090328012754-et08kurwwapknnbz
parent: pqm at pqm.ubuntu.com-20090327165538-lustxviiwnrfg2u2
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.114
timestamp: Sat 2009-03-28 11:27:54 +1000
message:
replace experimental development-wt5 formats with 1.14 formats
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
bzrlib/tests/blackbox/test_filtered_view_ops.py test_filtered_view_o-20081110012645-5t7ogtola0l33lkg-1
bzrlib/tests/blackbox/test_view.py test_view.py-20080731135100-66o8o32heop7augi-1
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
doc/en/user-guide/filtered_views.txt filtered_views.txt-20090226100856-a16ba1v97v91ru58-1
------------------------------------------------------------
revno: 4226.1.3
revision-id: pqm at pqm.ubuntu.com-20090401063434-motksin95y4undi6
parent: pqm at pqm.ubuntu.com-20090401054055-ljlwhq6q0w6eju8s
parent: robertc at robertcollins.net-20090401054558-i6u5qxltq0q096or
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-04-01 07:34:34 +0100
message:
(robertc) Lift up Branch7.set_stacked_on_url to Branch,
allowing reuse by RemoteBranch and decreasing round trips for pushing
new stacked branches. (Robert Collins, Andrew Bennetts)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
------------------------------------------------------------
revno: 4226.1.2
revision-id: pqm at pqm.ubuntu.com-20090401054055-ljlwhq6q0w6eju8s
parent: pqm at pqm.ubuntu.com-20090401045536-om9uljc07rrcknxi
parent: robertc at robertcollins.net-20090401040529-vwb8tpu42jk2m0w6
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-04-01 06:40:55 +0100
message:
(robertc) No longer call _ensure_real in
RemoteRepository.add_fallback_repository. (Robert Collins,
Andrew Bennetts)
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 4226.1.1
revision-id: pqm at pqm.ubuntu.com-20090401045536-om9uljc07rrcknxi
parent: pqm at pqm.ubuntu.com-20090401030426-i2p8321efq55f7jm
parent: robertc at robertcollins.net-20090326041854-amyhfrfar5p7k6rl
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-04-01 05:55:36 +0100
message:
(robertc) Import needed module for a doctest. (Robert Collins)
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 4205.4.1
revision-id: robertc at robertcollins.net-20090326041854-amyhfrfar5p7k6rl
parent: pqm at pqm.ubuntu.com-20090326001427-mnhqpak56tlqa5e7
committer: Robert Collins <robertc at robertcollins.net>
branch nick: tests.fixes
timestamp: Thu 2009-03-26 15:18:54 +1100
message:
Import needed module for a doctest.
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
Diff too large for email (1392 lines, the limit is 1000).
More information about the bazaar-commits
mailing list