Rev 1647: Implement plan_merge for knits in
/home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Wed Apr 19 09:36:52 BST 2006
------------------------------------------------------------
revno: 1647
revision-id: pqm at pqm.ubuntu.com-20060419083650-f26d296f90d75d88
parent: pqm at pqm.ubuntu.com-20060419083108-fab2970f4575b010
parent: aaron.bentley at utoronto.ca-20060419025517-3d096c3d15d86c5b
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-04-19 09:36:50 +0100
message:
Implement plan_merge for knits
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_weave.py testknit.py-20050627023648-9833cc5562ffb785
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060419025517-3d096c3d15d86c5b
parent: aaron.bentley at utoronto.ca-20060419025056-3847eb042f075760
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.knitplanmerge
timestamp: Tue 2006-04-18 22:55:17 -0400
message:
spacing fix
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060419025056-3847eb042f075760
parent: aaron.bentley at utoronto.ca-20060419022851-f6748c7087f60284
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.knitplanmerge
timestamp: Tue 2006-04-18 22:50:56 -0400
message:
Knit plan_merge uses slices instead of xenumerate
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060419022851-f6748c7087f60284
parent: aaron.bentley at utoronto.ca-20060419020851-830a65e114637604
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.knitplanmerge
timestamp: Tue 2006-04-18 22:28:51 -0400
message:
Remove unused final-section processing
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060419020851-830a65e114637604
parent: aaron.bentley at utoronto.ca-20060419001335-0a0be1ca65406fd6
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.knitplanmerge
timestamp: Tue 2006-04-18 22:08:51 -0400
message:
Clarifications from merge review
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060419001335-0a0be1ca65406fd6
parent: aaron.bentley at utoronto.ca-20060418234234-d3d230b99ba70b9f
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.knitplanmerge
timestamp: Tue 2006-04-18 20:13:35 -0400
message:
Move xenumerate to osutils
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060418234234-d3d230b99ba70b9f
parent: abentley at panoramicfeedback.com-20060418134348-a1ff927ea2817900
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.knitplanmerge
timestamp: Tue 2006-04-18 19:42:34 -0400
message:
Ported weave merge test to versionedfile
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060418134348-a1ff927ea2817900
parent: aaron.bentley at utoronto.ca-20060418064459-eb09de30e77bb019
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.knitplanmerge
timestamp: Tue 2006-04-18 09:43:48 -0400
message:
Fix WeaveMerge when plan doesn't end with unchanged lines
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060418064459-eb09de30e77bb019
parent: aaron.bentley at utoronto.ca-20060418001954-c50f6819b61db0b3
parent: pqm at pqm.ubuntu.com-20060418055925-0f7129a54583f4d8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.knitplanmerge
timestamp: Tue 2006-04-18 02:44:59 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060418001954-c50f6819b61db0b3
parent: aaron.bentley at utoronto.ca-20060418001818-baae282494c418b7
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.knitplanmerge
timestamp: Mon 2006-04-17 20:19:54 -0400
message:
Got plan-merge passing tests
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060418001818-baae282494c418b7
parent: aaron.bentley at utoronto.ca-20060417235815-a697cfaf11a2ed1a
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.knitplanmerge
timestamp: Mon 2006-04-17 20:18:18 -0400
message:
Update plan-merge legend
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060417235815-a697cfaf11a2ed1a
parent: aaron.bentley at utoronto.ca-20060417225954-79d47d850ef690b1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.knitplanmerge
timestamp: Mon 2006-04-17 19:58:15 -0400
message:
Identify unchanged lines correctly
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060417225954-79d47d850ef690b1
parent: aaron.bentley at utoronto.ca-20060417225911-2465ef6f4183b4fb
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.knitplanmerge
timestamp: Mon 2006-04-17 18:59:54 -0400
message:
Add failing test case
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060417225911-2465ef6f4183b4fb
parent: aaron.bentley at utoronto.ca-20060417121022-ed00460ca5e81ac0
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.knitplanmerge
timestamp: Mon 2006-04-17 18:59:11 -0400
message:
Added legend for plan-merge output
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060417121022-ed00460ca5e81ac0
parent: pqm at pqm.ubuntu.com-20060414013800-bd0ac9b0d1f8ba7b
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.knitplanmerge
timestamp: Mon 2006-04-17 08:10:22 -0400
message:
Start work on plan_merge test
More information about the bazaar-commits
mailing list