Rev 1622: New conflict-handling system in
/home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Sun Apr 9 17:49:23 BST 2006
------------------------------------------------------------
revno: 1622
revision-id: pqm at pqm.ubuntu.com-20060409164922-071803e906c8b96d
parent: pqm at pqm.ubuntu.com-20060407211144-0d74356b1cc77c00
parent: aaron.bentley at utoronto.ca-20060409163250-95b35cee9c2837ce
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2006-04-09 17:49:22 +0100
message:
New conflict-handling system
modified:
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/conflicts.py conflicts.py-20051001061850-78ef952ba63d2b42
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/rio.py rio.py-20051128032247-770b120b34dfff60
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/test_conflicts.py test_conflicts.py-20051006031059-e2dad9bbeaa5891f
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_rio.py test_rio.py-20051128032247-dcd1082dfc86d3d3
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060409163250-95b35cee9c2837ce
parent: aaron.bentley at utoronto.ca-20060406043505-72112dc45d5b42fa
parent: pqm at pqm.ubuntu.com-20060407211144-0d74356b1cc77c00
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Sun 2006-04-09 12:32:50 -0400
message:
Merge from mainline
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060406043505-72112dc45d5b42fa
parent: abentley at panoramicfeedback.com-20060405205841-44fc6af28076b671
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Thu 2006-04-06 00:35:05 -0400
message:
Remove unused variable
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060405205841-44fc6af28076b671
parent: abentley at panoramicfeedback.com-20060405203737-d50848ef2df7344a
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ttransform
timestamp: Wed 2006-04-05 16:58:41 -0400
message:
Move select_conflicts into ConflictList
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060405203737-d50848ef2df7344a
parent: abentley at panoramicfeedback.com-20060405184831-75d8f15c293393e7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ttransform
timestamp: Wed 2006-04-05 16:37:37 -0400
message:
Eliminated conflicts_to_strings, made remove_files a ConflictList member
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060405184831-75d8f15c293393e7
parent: abentley at panoramicfeedback.com-20060405180515-4be2a622206de1f7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ttransform
timestamp: Wed 2006-04-05 14:48:31 -0400
message:
Removed conflicts_to_stanzas and stanzas_to_conflicts
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060405180515-4be2a622206de1f7
parent: aaron.bentley at utoronto.ca-20060405045400-7b57a53ee7fdaab6
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ttransform
timestamp: Wed 2006-04-05 14:05:15 -0400
message:
Got ConflictList implemented
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060405045400-7b57a53ee7fdaab6
parent: aaron.bentley at utoronto.ca-20060405042935-7a86762d00a3ae2e
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Wed 2006-04-05 00:54:00 -0400
message:
Moved and renamed conflict functions
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060405042935-7a86762d00a3ae2e
parent: aaron.bentley at utoronto.ca-20060405023303-2e361c95d1fca567
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Wed 2006-04-05 00:29:35 -0400
message:
Got all tests passing
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060405023303-2e361c95d1fca567
parent: aaron.bentley at utoronto.ca-20060405014615-660100e563d684ec
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Tue 2006-04-04 22:33:03 -0400
message:
Stanza conversion, cooking
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060405014615-660100e563d684ec
parent: aaron.bentley at utoronto.ca-20060405010206-6e9c04f514c1c5e1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Tue 2006-04-04 21:46:15 -0400
message:
Defined all new Conflict types
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060405010206-6e9c04f514c1c5e1
parent: abentley at panoramicfeedback.com-20060310190131-7092bff9317ca8f5
parent: aaron.bentley at utoronto.ca-20060404064141-9b186bd6f384b7bc
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Tue 2006-04-04 21:02:06 -0400
message:
Merge bzr.ab.integration
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060404064141-9b186bd6f384b7bc
parent: aaron.bentley at utoronto.ca-20060331020235-369b764c5e0478f7
parent: pqm at pqm.ubuntu.com-20060404014851-ae9a2babfd810da1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ab.integration
timestamp: Tue 2006-04-04 02:41:41 -0400
message:
Merge from bzr.dev
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060310190131-7092bff9317ca8f5
parent: abentley at panoramicfeedback.com-20060310183258-16ab2b131a6fa4d0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-03-10 14:01:31 -0500
message:
Small tweaks
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060310183258-16ab2b131a6fa4d0
parent: abentley at panoramicfeedback.com-20060310181313-1865330914401573
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-03-10 13:32:58 -0500
message:
Revert does resolve
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060310181313-1865330914401573
parent: abentley at panoramicfeedback.com-20060310181255-7fa303d9c5004ebb
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-03-10 13:13:13 -0500
message:
Made revert clear conflicts
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060310181255-7fa303d9c5004ebb
parent: abentley at panoramicfeedback.com-20060310175856-0176fbda98269e87
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-03-10 13:12:55 -0500
message:
Fixed relpaths
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060310175856-0176fbda98269e87
parent: abentley at panoramicfeedback.com-20060310173202-c6c73a8f6e75e954
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-03-10 12:58:56 -0500
message:
Merge produces new conflicts
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060310173202-c6c73a8f6e75e954
parent: abentley at panoramicfeedback.com-20060310170547-dee4d0542ffe7281
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-03-10 12:32:02 -0500
message:
Handle path conflicts properly
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060310170547-dee4d0542ffe7281
parent: abentley at panoramicfeedback.com-20060310161004-8e7c784a0ba225de
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-03-10 12:05:47 -0500
message:
Resolve uses the new stuff.
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060310161004-8e7c784a0ba225de
parent: abentley at panoramicfeedback.com-20060310152559-1a02f3c368f5b792
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-03-10 11:10:04 -0500
message:
Switched display functions to conflict_lines
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060310152559-1a02f3c368f5b792
parent: aaron.bentley at utoronto.ca-20060310064653-8fb4a519ce6da639
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-03-10 10:25:59 -0500
message:
Implemented conflict_lines in terms of old system on WorkingTree
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060310064653-8fb4a519ce6da639
parent: aaron.bentley at utoronto.ca-20060310062013-73726f82ca89344c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-03-10 01:46:53 -0500
message:
Added tests for bad conflict lists
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060310062013-73726f82ca89344c
parent: aaron.bentley at utoronto.ca-20060310054959-f8910ff580a5a466
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-03-10 01:20:13 -0500
message:
Conflict serialization working for WorkingTree3
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060310054959-f8910ff580a5a466
parent: abentley at panoramicfeedback.com-20060309225429-9b81ae72b0f23221
parent: aaron.bentley at utoronto.ca-20060310012247-c1047250bef6c49a
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-03-10 00:49:59 -0500
message:
Merged latest from bzr.dev
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060309225429-9b81ae72b0f23221
parent: abentley at panoramicfeedback.com-20060309194148-4243caddfe4ed053
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-03-09 17:54:29 -0500
message:
Implemented conflict serialization
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060309194148-4243caddfe4ed053
parent: abentley at panoramicfeedback.com-20060309184740-1bbba4a768e7628c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-03-09 14:41:48 -0500
message:
Simplify set_merge_modified with rio_file
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060309184740-1bbba4a768e7628c
parent: abentley at panoramicfeedback.com-20060309175721-8ecf058bc095ab87
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-03-09 13:47:40 -0500
message:
Implemented rio_file to produce a light file object from stanzas
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060309175721-8ecf058bc095ab87
parent: abentley at panoramicfeedback.com-20060306152723-1352864764612eb9
parent: abentley at panoramicfeedback.com-20060309170600-f47c647f127ea53a
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-03-09 12:57:21 -0500
message:
Merge from bzr.ab.integration
More information about the bazaar-commits
mailing list