Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
ZEO
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
ZEO
Commits
2c3b49fe
Commit
2c3b49fe
authored
Oct 26, 2008
by
Jim Fulton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use a file storage, rather than a ConflictResolvingMappingStorage.
parent
f199bf96
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
7 deletions
+4
-7
src/ZODB/ConflictResolution.txt
src/ZODB/ConflictResolution.txt
+4
-7
No files found.
src/ZODB/ConflictResolution.txt
View file @
2c3b49fe
...
@@ -85,9 +85,8 @@ story.
...
@@ -85,9 +85,8 @@ story.
First we create a storage and a database, and put a PCounter in the database.
First we create a storage and a database, and put a PCounter in the database.
>>> from ZODB.DB import DB
>>> import ZODB
>>> from ZODB.tests.util import ConflictResolvingMappingStorage
>>> db = ZODB.DB('Data.fs')
>>> db = DB(ConflictResolvingMappingStorage())
>>> import transaction
>>> import transaction
>>> tm_A = transaction.TransactionManager()
>>> tm_A = transaction.TransactionManager()
>>> conn_A = db.open(transaction_manager=tm_A)
>>> conn_A = db.open(transaction_manager=tm_A)
...
@@ -420,10 +419,8 @@ integrity issues.
...
@@ -420,10 +419,8 @@ integrity issues.
what is going on here.
what is going on here.
>>> databases = {}
>>> databases = {}
>>> db1 = DB(ConflictResolvingMappingStorage(),
>>> db1 = ZODB.DB('1', databases=databases, database_name='1')
... databases=databases, database_name='1')
>>> db2 = ZODB.DB('2', databases=databases, database_name='2')
>>> db2 = DB(ConflictResolvingMappingStorage(),
... databases=databases, database_name='2')
>>> tm_multi_A = transaction.TransactionManager()
>>> tm_multi_A = transaction.TransactionManager()
>>> conn_1A = db1.open(transaction_manager=tm_multi_A)
>>> conn_1A = db1.open(transaction_manager=tm_multi_A)
>>> conn_2A = conn_1A.get_connection('2')
>>> conn_2A = conn_1A.get_connection('2')
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment