Rev 2664: Clean up merge command, support arbitrary revisions in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Tue Jul 31 13:22:46 BST 2007
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 2664
revision-id: pqm at pqm.ubuntu.com-20070731122244-f1jemfecukeevugw
parent: pqm at pqm.ubuntu.com-20070731051059-q0z19zdpq7t76iex
parent: aaron.bentley at utoronto.ca-20070731112050-5x29s1kop4x19s05
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-07-31 13:22:44 +0100
message:
Clean up merge command, support arbitrary revisions
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/tests/blackbox/test_ancestry.py test_ancestry.py-20060131142602-6d9524c490537e90
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/branch_implementations/test_bound_sftp.py test_bound_sftp.py-20051231055311-2f96048c4f0940ef
bzrlib/tests/repository_implementations/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_missing.py test_missing.py-20051212000028-694fa4f658a81f48
bzrlib/tests/test_revisionnamespaces.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
bzrlib/tests/workingtree_implementations/test_merge_from_branch.py test_merge_from_bran-20060904034200-12jxyk2zlhpufxe1-1
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.77
merged: aaron.bentley at utoronto.ca-20070731112050-5x29s1kop4x19s05
parent: aaron.bentley at utoronto.ca-20070731035742-38zy7r3bqt3ykk8n
parent: pqm at pqm.ubuntu.com-20070731051059-q0z19zdpq7t76iex
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-07-31 07:20:50 -0400
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.76
merged: aaron.bentley at utoronto.ca-20070731035742-38zy7r3bqt3ykk8n
parent: abentley at panoramicfeedback.com-20070730175826-k72na5llh3b4b0kf
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2007-07-30 23:57:42 -0400
message:
Add unit tests from Merger.from_*
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.75
merged: abentley at panoramicfeedback.com-20070730175826-k72na5llh3b4b0kf
parent: abentley at panoramicfeedback.com-20070730175254-b8fa40bg5q7uysof
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2007-07-30 13:58:26 -0400
message:
_merger_from_branch -> _get_merger_from_branch
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.74
merged: abentley at panoramicfeedback.com-20070730175254-b8fa40bg5q7uysof
parent: abentley at panoramicfeedback.com-20070725230135-pak1o3m09yuvfdfa
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2007-07-30 13:52:54 -0400
message:
Textual updates from review
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.73
merged: abentley at panoramicfeedback.com-20070725230135-pak1o3m09yuvfdfa
parent: abentley at panoramicfeedback.com-20070725225416-ux5bt1v31nxunrkl
parent: pqm at pqm.ubuntu.com-20070725140043-22lenkarm0oc3tvx
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2007-07-25 19:01:35 -0400
message:
merge from bzr.dev
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.72
merged: abentley at panoramicfeedback.com-20070725225416-ux5bt1v31nxunrkl
parent: abentley at panoramicfeedback.com-20070725220847-2aek1iylkva885us
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2007-07-25 18:54:16 -0400
message:
remove builtins._merge_helper
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.71
merged: abentley at panoramicfeedback.com-20070725220847-2aek1iylkva885us
parent: abentley at panoramicfeedback.com-20070725220313-3yi654e1utu1xd73
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2007-07-25 18:08:47 -0400
message:
Fix test case that was importing merge when it didn't need to
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.70
merged: abentley at panoramicfeedback.com-20070725220313-3yi654e1utu1xd73
parent: abentley at panoramicfeedback.com-20070725212500-fgat8y4yyrb18p8l
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2007-07-25 18:03:13 -0400
message:
Avoid using builtins.merge
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.69
merged: abentley at panoramicfeedback.com-20070725212500-fgat8y4yyrb18p8l
parent: abentley at panoramicfeedback.com-20070725202641-mrsnd52yuj938ko5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2007-07-25 17:25:00 -0400
message:
Add merge_type to merge_from_branch
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.68
merged: abentley at panoramicfeedback.com-20070725202641-mrsnd52yuj938ko5
parent: abentley at panoramicfeedback.com-20070725193222-lcq4z4980ffd4bf5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2007-07-25 16:26:41 -0400
message:
Add support for base to merge_from_branch
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.67
merged: abentley at panoramicfeedback.com-20070725193222-lcq4z4980ffd4bf5
parent: abentley at panoramicfeedback.com-20070725163713-6v5bn3w4dhsl5qnq
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2007-07-25 15:32:22 -0400
message:
Stop using _merge_helper for merging
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.66
merged: abentley at panoramicfeedback.com-20070725163713-6v5bn3w4dhsl5qnq
parent: abentley at panoramicfeedback.com-20070725131247-ffbi7v0wtv88zk1w
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2007-07-25 12:37:13 -0400
message:
Improve behavior with revision ids
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.65
merged: abentley at panoramicfeedback.com-20070725131247-ffbi7v0wtv88zk1w
parent: abentley at panoramicfeedback.com-20070725130409-7r2tfpn3y01ct18h
parent: pqm at pqm.ubuntu.com-20070725024725-x592w4y7gdqxv81x
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2007-07-25 09:12:47 -0400
message:
merge bzr.dev
Diff too large for email (1145 lines, the limit is 1000).
More information about the bazaar-commits
mailing list