Rev 2288: Generate iter_changes output from TreeTransform, use in merge, revert, etc. in /home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Thu Feb 15 02:37:53 GMT 2007
------------------------------------------------------------
revno: 2288
revision-id: pqm at pqm.ubuntu.com-20070215023751-277626e9357e8a6c
parent: pqm at pqm.ubuntu.com-20070215000418-497ae3e1b4def622
parent: abentley at panoramicfeedback.com-20070214215740-qehopznuc8to99oy
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-02-15 02:37:51 +0000
message:
Generate iter_changes output from TreeTransform, use in merge, revert, etc.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/apply_bundle.py apply_changeset.py-20050620044656-dba4eb8021a36f95
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/blackbox/test_revert.py test_revert.py-20060124160917-485ce9de629c182c
bzrlib/tests/test_delta.py test_delta.py-20070110134455-sqpd1y7mbjndelxf-1
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070214215740-qehopznuc8to99oy
parent: abentley at panoramicfeedback.com-20070214214053-8n2v072t516l832t
parent: pqm at pqm.ubuntu.com-20070214095120-13e5c64a9d83e718
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Wed 2007-02-14 16:57:40 -0500
message:
Merge bzr.dev
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070214214053-8n2v072t516l832t
parent: abentley at panoramicfeedback.com-20070209170947-dnalqph1nyfqfy1z
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Wed 2007-02-14 16:40:53 -0500
message:
Changes from review
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070209170947-dnalqph1nyfqfy1z
parent: abentley at panoramicfeedback.com-20070209162622-mczvdmtgxwwi91mq
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Fri 2007-02-09 12:09:47 -0500
message:
Get tests passing
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070209162622-mczvdmtgxwwi91mq
parent: abentley at panoramicfeedback.com-20070209155649-qxg6cqptrwyd4xof
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Fri 2007-02-09 11:26:22 -0500
message:
Add change reporting to pull
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070209155649-qxg6cqptrwyd4xof
parent: abentley at panoramicfeedback.com-20070209153710-m6fu3erfqstab4fb
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Fri 2007-02-09 10:56:49 -0500
message:
Apply change reporting to merge
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070209153710-m6fu3erfqstab4fb
parent: abentley at panoramicfeedback.com-20070209152812-eq7fxk7cjwl8sxdp
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Fri 2007-02-09 10:37:10 -0500
message:
Clarify what conflicts may not be present
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070209152812-eq7fxk7cjwl8sxdp
parent: abentley at panoramicfeedback.com-20070209150523-n4x3ipdf6d65fbxh
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Fri 2007-02-09 10:28:12 -0500
message:
Stop modified flag bleeding into later changes
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070209150523-n4x3ipdf6d65fbxh
parent: abentley at panoramicfeedback.com-20070209150223-881f6f36q96cgv6v
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Fri 2007-02-09 10:05:23 -0500
message:
Emit change listings before conflict warnings
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070209150223-881f6f36q96cgv6v
parent: abentley at panoramicfeedback.com-20070209141035-fq6bi6d6xeikl4fd
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Fri 2007-02-09 10:02:23 -0500
message:
cleanup
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070209141035-fq6bi6d6xeikl4fd
parent: abentley at panoramicfeedback.com-20070208224245-fyktmyk673mcl83t
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Fri 2007-02-09 09:10:35 -0500
message:
Sort output of Transform.iter_changes by path
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070208224245-fyktmyk673mcl83t
parent: abentley at panoramicfeedback.com-20070208221850-zkmikxazj7n8suc6
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Thu 2007-02-08 17:42:45 -0500
message:
Use tree transform to emit upcoming change list
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070208221850-zkmikxazj7n8suc6
parent: abentley at panoramicfeedback.com-20070208200737-2st6vnlue348aa1p
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Thu 2007-02-08 17:18:50 -0500
message:
Get kind change detection working for iter_changes
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20070208200737-2st6vnlue348aa1p
parent: abentley at panoramicfeedback.com-20070208150047-li7efd5nxn6bi4ew
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Thu 2007-02-08 15:07:37 -0500
message:
Initial work on converting TreeTransform to iter_changes format
More information about the bazaar-commits
mailing list