Rev 1570: revert destroys merge-created content auotmatically in
/home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Tue Mar 7 16:15:55 GMT 2006
------------------------------------------------------------
revno: 1570
revision-id: pqm at pqm.ubuntu.com-20060307161548-62e73f80c62f6a31
parent: pqm at pqm.ubuntu.com-20060307013022-b9258d2a0c135498
parent: aaron.bentley at utoronto.ca-20060307055914-a88728997afceb90
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-03-07 16:15:48 +0000
message:
revert destroys merge-created content auotmatically
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/tests/test_inv.py testinv.py-20050722220913-1dc326138d1a5892
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
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-20060307055914-a88728997afceb90
parent: abentley at panoramicfeedback.com-20060306152723-1352864764612eb9
parent: aaron.bentley at utoronto.ca-20060307053524-a5406e3bd1da02bb
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-03-07 00:59:14 -0500
message:
Merge from mainline
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060307053524-a5406e3bd1da02bb
parent: abentley at panoramicfeedback.com-20060301224424-69c91b7987524db0
parent: pqm at pqm.ubuntu.com-20060306074417-344f1d83d99b9730
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's integration
timestamp: Tue 2006-03-07 00:35:24 -0500
message:
Merged bzr.dev
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060306152723-1352864764612eb9
parent: aaron.bentley at utoronto.ca-20060301040904-cf81eb021c253024
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Mon 2006-03-06 10:27:23 -0500
message:
Moved merge/revert tests into test_workingtree.py
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060301040904-cf81eb021c253024
parent: aaron.bentley at utoronto.ca-20060301040612-4aba0fff89bdd24f
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-02-28 23:09:04 -0500
message:
Removed spurious encode/decode
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060301040612-4aba0fff89bdd24f
parent: aaron.bentley at utoronto.ca-20060301034749-8e59bf2706d3c9c0
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-02-28 23:06:12 -0500
message:
Removed splatfile format
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060301034749-8e59bf2706d3c9c0
parent: abentley at panoramicfeedback.com-20060224215755-0147b9bf4e26322a
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-02-28 22:47:49 -0500
message:
Switched to Rio format for merge-modified list
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060224215755-0147b9bf4e26322a
parent: abentley at panoramicfeedback.com-20060224214518-9c9b7a8f5c9a2ca0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-24 16:57:55 -0500
message:
Cleanups
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060224214518-9c9b7a8f5c9a2ca0
parent: abentley at panoramicfeedback.com-20060224213810-c9c4c53420d2dc2a
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-24 16:45:18 -0500
message:
Added test case for file not added by merge
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060224213810-c9c4c53420d2dc2a
parent: abentley at panoramicfeedback.com-20060224190042-7131c3fb7b75cc24
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-24 16:38:10 -0500
message:
Stopped revert from preserving file contents produced by merges
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060224190042-7131c3fb7b75cc24
parent: abentley at panoramicfeedback.com-20060224170523-9ec3bd5c7a1ed4c7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-24 14:00:42 -0500
message:
Record hashes produced by merges
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060224170523-9ec3bd5c7a1ed4c7
parent: abentley at panoramicfeedback.com-20060224162838-5e3d05b42489fce5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-24 12:05:23 -0500
message:
Got transform.apply to list modified paths
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060224162838-5e3d05b42489fce5
parent: abentley at panoramicfeedback.com-20060224154418-8503726522af25d7
parent: abentley at panoramicfeedback.com-20060224161241-7875e2e8984975dd
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-24 11:28:38 -0500
message:
Merge from bzr.ab.integration
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060224154418-8503726522af25d7
parent: abentley at panoramicfeedback.com-20060224152617-66e9e6313b4b4eca
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-24 10:44:18 -0500
message:
Got splatfile handling arbitrary number of values per stanza
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060224152617-66e9e6313b4b4eca
parent: abentley at panoramicfeedback.com-20060223222421-69708e805169eb4f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-24 10:26:17 -0500
message:
Changed name to splatfile, got tests passing
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060223222421-69708e805169eb4f
parent: abentley at panoramicfeedback.com-20060223151247-9dc5e11197026907
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-02-23 17:24:21 -0500
message:
Created yet another map file format
More information about the bazaar-commits
mailing list