Rev 2389: merge and pull support merge directives in /home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Sun Apr 1 06:11:51 BST 2007
------------------------------------------------------------
revno: 2389
revision-id: pqm at pqm.ubuntu.com-20070401051140-280aed4369df0386
parent: pqm at pqm.ubuntu.com-20070330064022-bdce9356befc3795
parent: aaron.bentley at utoronto.ca-20070401043208-trrrj3rmubg9b785
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2007-04-01 06:11:40 +0100
message:
merge and pull support merge directives
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/__init__.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/bundle/serializer/v08.py v06.py-20051119041339-ee43f97270b01823
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20070401043208-trrrj3rmubg9b785
parent: aaron.bentley at utoronto.ca-20070401040614-3f0tytdrc2jtv8f6
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Sun 2007-04-01 00:32:08 -0400
message:
Update NEWS
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20070401040614-3f0tytdrc2jtv8f6
parent: aaron.bentley at utoronto.ca-20070401040347-0raf64jx909yhs6q
parent: pqm at pqm.ubuntu.com-20070330064022-bdce9356befc3795
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Sun 2007-04-01 00:06:14 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20070401040347-0raf64jx909yhs6q
parent: aaron.bentley at utoronto.ca-20070401035812-bankq62dvnuyq0gx
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Sun 2007-04-01 00:03:47 -0400
message:
rename rev_id and other_rev_id
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20070401035812-bankq62dvnuyq0gx
parent: aaron.bentley at utoronto.ca-20070401035231-w87zy7hrpre4v81m
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Sat 2007-03-31 23:58:12 -0400
message:
Remove 'manual' from test names
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20070401035231-w87zy7hrpre4v81m
parent: aaron.bentley at utoronto.ca-20070319010545-1n2gkcvcr76sb6lx
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Sat 2007-03-31 23:52:31 -0400
message:
rename get_target_revision to install_revisions
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20070319010545-1n2gkcvcr76sb6lx
parent: abentley at panoramicfeedback.com-20070316174716-0se6k7b4sqr9t12d
parent: pqm at pqm.ubuntu.com-20070317015305-7b7562331da9f786
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Sun 2007-03-18 21:05:45 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070316174716-0se6k7b4sqr9t12d
parent: abentley at panoramicfeedback.com-20070316152110-crvg8yllxe1zt105
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Fri 2007-03-16 13:47:16 -0400
message:
test suite fixes
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070316152110-crvg8yllxe1zt105
parent: abentley at panoramicfeedback.com-20070316151629-g2p2eyd85juh3a9k
parent: pqm at pqm.ubuntu.com-20070314155044-47c0c6257a6c6717
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Fri 2007-03-16 11:21:10 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070316151629-g2p2eyd85juh3a9k
parent: abentley at panoramicfeedback.com-20070316151440-kwqaumvxjcyiurv2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Fri 2007-03-16 11:16:29 -0400
message:
cleanup
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070316151440-kwqaumvxjcyiurv2
parent: abentley at panoramicfeedback.com-20070313182421-cdkkqs8lltdfzr4d
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Fri 2007-03-16 11:14:40 -0400
message:
Change bundle reader and merge directive to both be 'mergeables'
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070313182421-cdkkqs8lltdfzr4d
parent: abentley at panoramicfeedback.com-20070313174130-uyqqjc9erz4ej3cd
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Tue 2007-03-13 14:24:21 -0400
message:
Remove unused include
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070313174130-uyqqjc9erz4ej3cd
parent: abentley at panoramicfeedback.com-20070313171325-8x3xsmisicrpam53
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Tue 2007-03-13 13:41:30 -0400
message:
Support manual merge from merge directives
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070313171325-8x3xsmisicrpam53
parent: abentley at panoramicfeedback.com-20070313165944-pzj5m0xkzjlgnaa2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Tue 2007-03-13 13:13:25 -0400
message:
Allow pull from a merge directive
More information about the bazaar-commits
mailing list