User story #4188
open
User story #4187: Allow more granular check for Change Request merge test
Add granular check on change request change (not on directive parameter)
Added by François ARMAND about 11 years ago.
Updated 3 months ago.
Category:
Web - Config management
Description
The logic to implement here is:
- only look for field in the object of the change request that actually changed thanks to that CR
- check if these fields have changed in a conflicting way for current object. Non conflict are:
- the field is the same that at CR creation time
- the current state is the same than the one targetted by the change request (so it's a no-operation change compare to current state)
- in a set of elements, there is no conflict for add/delete (i.e: adding a directive to a rule can neither conflict with other modification of the list of directive of that rule)
- in a list of element (where order matters):
- modification of an element and addition are non conflicting,
- deletion is always conflicting (simplification),
- two modification on different element are not conflicting
- two modification of the same element are conflicting with the same rules as for fields.
For now, parameters are considered to be non structured field and are only looked for equality (i.e: merge conflict even if two different parameters were changed).
- Target version changed from 2.9.0~rc1 to 2.9.0~rc2
- Target version changed from 2.9.0~rc2 to 2.9.0
Delayed to 2.9 finale release
- Target version changed from 2.9.0 to 2.10.0~beta1
- Target version changed from 2.10.0~beta1 to 2.11.0~beta1
- Target version changed from 2.11.0~beta1 to 140
- Target version changed from 140 to 3.0.0~beta1
- Target version changed from 3.0.0~beta1 to 3.1.0~beta1
- Status changed from 8 to New
- Tracker changed from Enhancement to User story
- Target version changed from 3.1.0~beta1 to 3.1.0~rc1
- Target version changed from 3.1.0~rc1 to 3.1.0
- Target version changed from 3.1.0 to 3.1.1
- Target version changed from 3.1.1 to 3.1.2
- Target version changed from 3.1.2 to 3.1.3
- Target version changed from 3.1.3 to 3.1.4
- Target version changed from 3.1.4 to 3.1.5
- Target version changed from 3.1.5 to 3.1.6
- Target version changed from 3.1.6 to 3.1.7
- Target version changed from 3.1.7 to 3.1.8
- Target version changed from 3.1.8 to 3.1.9
- Target version changed from 3.1.9 to 3.1.10
- Target version changed from 3.1.10 to 3.1.11
- Target version changed from 3.1.11 to 3.1.12
- Target version changed from 3.1.12 to 3.1.13
- Target version changed from 3.1.13 to 3.1.14
- Target version changed from 3.1.14 to 3.1.15
- Target version changed from 3.1.15 to 3.1.16
- Target version changed from 3.1.16 to 3.1.17
- Target version changed from 3.1.17 to 3.1.18
- Target version changed from 3.1.18 to 3.1.19
- Target version changed from 3.1.19 to 3.1.20
- Target version changed from 3.1.20 to 3.1.21
- Target version changed from 3.1.21 to 3.1.22
- Target version changed from 3.1.22 to 3.1.23
- Target version changed from 3.1.23 to 3.1.24
- Target version changed from 3.1.24 to 3.1.25
- Target version changed from 3.1.25 to 4.1.9
- Target version changed from 4.1.9 to 4.1.10
- Target version changed from 4.1.10 to Ideas (not version specific)
- Assignee deleted (
François ARMAND)
- Priority changed from 2 to N/A
Also available in: Atom
PDF