Rev 1670: Revision parameter for annotate in
/home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Thu May 4 07:21:59 BST 2006
------------------------------------------------------------
revno: 1670
revision-id: pqm at pqm.ubuntu.com-20060504062159-24dc5151bb9cba69
parent: pqm at pqm.ubuntu.com-20060503220107-7606072537025d30
parent: abentley at panoramicfeedback.com-20060503205044-6234433f38c83157
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-05-04 07:21:59 +0100
message:
Revision parameter for annotate
renamed:
bzrlib/tests/test_annotate.py => bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060503205044-6234433f38c83157
parent: abentley at panoramicfeedback.com-20060503204418-af2a19ca82ff0ea7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Wed 2006-05-03 16:50:44 -0400
message:
Added annotate test
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060503204418-af2a19ca82ff0ea7
parent: abentley at panoramicfeedback.com-20060503204236-56829ad9b13a5da4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Wed 2006-05-03 16:44:18 -0400
message:
Changed rev_id to revision_id in cmd_annotate
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060503204236-56829ad9b13a5da4
parent: abentley at panoramicfeedback.com-20060503203619-7572e90f2a91b644
parent: olaf at conradi.org-20060501210308-69720dff17b3d479
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Wed 2006-05-03 16:42:36 -0400
message:
Merge annotate -r from Olaf
------------------------------------------------------------
merged: olaf at conradi.org-20060501210308-69720dff17b3d479
parent: olaf at conradi.org-20060501205852-a98e0670fcd19265
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.annotate
timestamp: Mon 2006-05-01 23:03:08 +0200
message:
Add NEWS entry.
------------------------------------------------------------
merged: olaf at conradi.org-20060501205852-a98e0670fcd19265
parent: olaf at conradi.org-20060501203106-f3609b90d86cb863
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.annotate
timestamp: Mon 2006-05-01 22:58:52 +0200
message:
Move test case for annotate to blackbox, add tests for revision option.
------------------------------------------------------------
merged: olaf at conradi.org-20060501203106-f3609b90d86cb863
parent: pqm at pqm.ubuntu.com-20060429091950-d5ec09cd6e7c591a
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.annotate
timestamp: Mon 2006-05-01 22:31:06 +0200
message:
Add --revision option to bzr annotate command.
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060503203619-7572e90f2a91b644
parent: abentley at panoramicfeedback.com-20060417132055-3498a8631cb2fb31
parent: pqm at pqm.ubuntu.com-20060503071159-abd0de926d70d64c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Wed 2006-05-03 16:36:19 -0400
message:
Merge from bzr.dev
More information about the bazaar-commits
mailing list