Project

General

Profile

Actions

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.

Status:
New
Priority:
N/A
Assignee:
-
Category:
Web - Config management
UX impact:
Suggestion strength:
User visibility:
Effort required:
Name check:
Fix check:
Regression:

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).

Actions #1

Updated by Vincent MEMBRÉ almost 11 years ago

  • Target version changed from 2.9.0~rc1 to 2.9.0~rc2
Actions #2

Updated by Vincent MEMBRÉ almost 11 years ago

  • Target version changed from 2.9.0~rc2 to 2.9.0

Delayed to 2.9 finale release

Actions #3

Updated by François ARMAND almost 11 years ago

  • Target version changed from 2.9.0 to 2.10.0~beta1
Actions #4

Updated by Jonathan CLARKE over 10 years ago

  • Target version changed from 2.10.0~beta1 to 2.11.0~beta1
Actions #5

Updated by François ARMAND over 10 years ago

  • Target version changed from 2.11.0~beta1 to 140
Actions #6

Updated by Matthieu CERDA about 10 years ago

  • Target version changed from 140 to 3.0.0~beta1
Actions #7

Updated by Jonathan CLARKE about 10 years ago

  • Target version changed from 3.0.0~beta1 to 3.1.0~beta1
Actions #8

Updated by Benoît PECCATTE over 9 years ago

  • Status changed from 8 to New
Actions #9

Updated by Benoît PECCATTE over 9 years ago

  • Tracker changed from Enhancement to User story
Actions #10

Updated by Vincent MEMBRÉ over 9 years ago

  • Target version changed from 3.1.0~beta1 to 3.1.0~rc1
Actions #11

Updated by Vincent MEMBRÉ over 9 years ago

  • Target version changed from 3.1.0~rc1 to 3.1.0
Actions #12

Updated by Vincent MEMBRÉ over 9 years ago

  • Target version changed from 3.1.0 to 3.1.1
Actions #13

Updated by Vincent MEMBRÉ over 9 years ago

  • Target version changed from 3.1.1 to 3.1.2
Actions #14

Updated by Vincent MEMBRÉ about 9 years ago

  • Target version changed from 3.1.2 to 3.1.3
Actions #15

Updated by Vincent MEMBRÉ about 9 years ago

  • Target version changed from 3.1.3 to 3.1.4
Actions #16

Updated by Vincent MEMBRÉ about 9 years ago

  • Target version changed from 3.1.4 to 3.1.5
Actions #17

Updated by Vincent MEMBRÉ about 9 years ago

  • Target version changed from 3.1.5 to 3.1.6
Actions #18

Updated by Vincent MEMBRÉ almost 9 years ago

  • Target version changed from 3.1.6 to 3.1.7
Actions #19

Updated by Vincent MEMBRÉ almost 9 years ago

  • Target version changed from 3.1.7 to 3.1.8
Actions #20

Updated by Vincent MEMBRÉ almost 9 years ago

  • Target version changed from 3.1.8 to 3.1.9
Actions #21

Updated by Vincent MEMBRÉ over 8 years ago

  • Target version changed from 3.1.9 to 3.1.10
Actions #22

Updated by Vincent MEMBRÉ over 8 years ago

  • Target version changed from 3.1.10 to 3.1.11
Actions #23

Updated by Vincent MEMBRÉ over 8 years ago

  • Target version changed from 3.1.11 to 3.1.12
Actions #24

Updated by Vincent MEMBRÉ over 8 years ago

  • Target version changed from 3.1.12 to 3.1.13
Actions #25

Updated by Vincent MEMBRÉ over 8 years ago

  • Target version changed from 3.1.13 to 3.1.14
Actions #26

Updated by Vincent MEMBRÉ about 8 years ago

  • Target version changed from 3.1.14 to 3.1.15
Actions #27

Updated by Vincent MEMBRÉ about 8 years ago

  • Target version changed from 3.1.15 to 3.1.16
Actions #28

Updated by Vincent MEMBRÉ about 8 years ago

  • Target version changed from 3.1.16 to 3.1.17
Actions #29

Updated by Vincent MEMBRÉ about 8 years ago

  • Target version changed from 3.1.17 to 3.1.18
Actions #30

Updated by Vincent MEMBRÉ almost 8 years ago

  • Target version changed from 3.1.18 to 3.1.19
Actions #31

Updated by Vincent MEMBRÉ over 7 years ago

  • Target version changed from 3.1.19 to 3.1.20
Actions #32

Updated by Vincent MEMBRÉ over 7 years ago

  • Target version changed from 3.1.20 to 3.1.21
Actions #33

Updated by Vincent MEMBRÉ over 7 years ago

  • Target version changed from 3.1.21 to 3.1.22
Actions #34

Updated by Vincent MEMBRÉ over 7 years ago

  • Target version changed from 3.1.22 to 3.1.23
Actions #35

Updated by Vincent MEMBRÉ over 7 years ago

  • Target version changed from 3.1.23 to 3.1.24
Actions #36

Updated by Vincent MEMBRÉ about 7 years ago

  • Target version changed from 3.1.24 to 3.1.25
Actions #37

Updated by Benoît PECCATTE about 7 years ago

  • Target version changed from 3.1.25 to 4.1.9
Actions #38

Updated by Vincent MEMBRÉ about 7 years ago

  • Target version changed from 4.1.9 to 4.1.10
Actions #39

Updated by François ARMAND almost 7 years ago

  • Target version changed from 4.1.10 to Ideas (not version specific)
Actions #40

Updated by François ARMAND almost 7 years ago

  • Assignee deleted (François ARMAND)
Actions #41

Updated by François ARMAND 3 months ago

  • Priority changed from 2 to N/A
Actions

Also available in: Atom PDF