Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Laurent S
erp5
Commits
8712c638
Commit
8712c638
authored
Mar 09, 2016
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ConflictFreeLog: fix incremental conflict resolution
This is currently required for NEO.
parent
8af1da02
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletion
+4
-1
product/ERP5Type/ConflictFree.py
product/ERP5Type/ConflictFree.py
+4
-1
No files found.
product/ERP5Type/ConflictFree.py
View file @
8712c638
...
...
@@ -83,7 +83,10 @@ class ConflictFreeLog(Persistent):
return
dict
(
new_state
,
_log
=
saved_state
[
'_log'
][
d
:]
+
new_state
[
'_log'
])
# Another node rotated before us. Revert our rotation.
# Both the head and its predecessor conflict.
i
=
0
# The following computed value is normally 0, except:
# - if the another node rotated during a conflict resolution
# - and if this is not the first conflict resolution.
i
=
len
(
old_state
[
'_log'
])
-
d
else
:
# We didn't rotate. Just add our items to saved head.
# Only the head conflicts.
...
...
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