Rev 1644: implementation of --reprocess for weave merge in
/home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Tue Apr 18 06:59:27 BST 2006
------------------------------------------------------------
revno: 1644
revision-id: pqm at pqm.ubuntu.com-20060418055925-0f7129a54583f4d8
parent: pqm at pqm.ubuntu.com-20060418052303-2170dd38c5ed278b
parent: aaron.bentley at utoronto.ca-20060418022414-28c7228e9c99bd4d
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-04-18 06:59:25 +0100
message:
implementation of --reprocess for weave merge
added:
bzrlib/tests/test_textmerge.py test_textmerge.py-20060408165803-fab93ab605a78e56
bzrlib/textmerge.py textmerge.py-20060408064938-a5d5c009e64a3a25
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060418022414-28c7228e9c99bd4d
parent: aaron.bentley at utoronto.ca-20060411052153-68f838bc991e957a
parent: pqm at pqm.ubuntu.com-20060417143529-5d0dd66032fb3b23
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2006-04-17 22:24:14 -0400
message:
Merge from bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060411052153-68f838bc991e957a
parent: aaron.bentley at utoronto.ca-20060410054228-c52ef0916514c7b8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2006-04-11 01:21:53 -0400
message:
Moved plan_merge into Weave
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060410054228-c52ef0916514c7b8
parent: aaron.bentley at utoronto.ca-20060409003406-13704529293d6476
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2006-04-10 01:42:28 -0400
message:
Tweaks from merge review
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060409003406-13704529293d6476
parent: aaron.bentley at utoronto.ca-20060408235733-555b6583f267b843
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sat 2006-04-08 20:34:06 -0400
message:
Cleanup
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060408235733-555b6583f267b843
parent: aaron.bentley at utoronto.ca-20060408231927-22523ebc54811274
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sat 2006-04-08 19:57:33 -0400
message:
Indicate conflicts from merge_lines, insead of guessing
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060408231927-22523ebc54811274
parent: aaron.bentley at utoronto.ca-20060408212236-0dde8f96083e4cc7
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sat 2006-04-08 19:19:27 -0400
message:
Switched TextMerge_lines to work on a list
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060408212236-0dde8f96083e4cc7
parent: aaron.bentley at utoronto.ca-20060408210604-f9cc3c2fcb3c8621
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sat 2006-04-08 17:22:36 -0400
message:
Renamed WeaveMerge to PlanMerge, added plan method, created planless WeaveMerge
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060408210604-f9cc3c2fcb3c8621
parent: aaron.bentley at utoronto.ca-20060408190033-945cb4450db553d1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sat 2006-04-08 17:06:04 -0400
message:
Moved merge tests into blackbox/test_merge
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060408190033-945cb4450db553d1
parent: aaron.bentley at utoronto.ca-20060408165812-069fc028a0cf75e5
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sat 2006-04-08 15:00:33 -0400
message:
Implemented reprocess for weave
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060408165812-069fc028a0cf75e5
parent: aaron.bentley at utoronto.ca-20060407233211-0bbeea55e04ad125
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sat 2006-04-08 12:58:12 -0400
message:
Implemented two-way merge, refactored weave merge
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060407233211-0bbeea55e04ad125
parent: aaron.bentley at utoronto.ca-20060407232912-0f675a6b2e549f42
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2006-04-07 19:32:11 -0400
message:
Cleanup
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060407232912-0f675a6b2e549f42
parent: aaron.bentley at utoronto.ca-20060407223947-730e8436858d086e
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2006-04-07 19:29:12 -0400
message:
Got weave merge producing structural output
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060407223947-730e8436858d086e
parent: aaron.bentley at utoronto.ca-20060405005914-590c2fd9ca967bf4
parent: aaron.bentley at utoronto.ca-20060407120040-1c73629500df0d87
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2006-04-07 18:39:47 -0400
message:
Merge from bzr.ab.integration
More information about the bazaar-commits
mailing list