Commit 92f0b983 authored 5 years ago by Simon Urli

XWIKI-16464: Merge conflict: allow choice by chunks and custom fixes

  * Refactoring of merge implementations to rely on a dedicated
component and to be able to record properly the conflicts.
  * Start the implementation of a conflict decision manager to record
the decision taken on the conflicts.

parent 1f24f9a4

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

xwiki-platform-core/pom.xml 17 additions, 0 deletions

xwiki-platform-core/pom.xml
xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-handlers/xwiki-platform-extension-handler-xar/pom.xml 6 additions, 0 deletions

...ion-handlers/xwiki-platform-extension-handler-xar/pom.xml
xwiki-platform-core/xwiki-platform-minimaldependencies/pom.xml 1 addition, 1 deletion

...-platform-core/xwiki-platform-minimaldependencies/pom.xml
xwiki-platform-core/xwiki-platform-oldcore/pom.xml 6 additions, 0 deletions

xwiki-platform-core/xwiki-platform-oldcore/pom.xml
xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java 16 additions, 217 deletions

...ldcore/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java
xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/internal/merge/MergeUtils.java 0 additions, 236 deletions

...rc/main/java/com/xpn/xwiki/internal/merge/MergeUtils.java
xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/objects/BaseElement.java 19 additions, 3 deletions

...core/src/main/java/com/xpn/xwiki/objects/BaseElement.java
xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/objects/LargeStringProperty.java 8 additions, 2 deletions

.../main/java/com/xpn/xwiki/objects/LargeStringProperty.java
xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/objects/ListProperty.java 11 additions, 2 deletions

...ore/src/main/java/com/xpn/xwiki/objects/ListProperty.java
xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/objects/classes/BaseClass.java 47 additions, 21 deletions

...rc/main/java/com/xpn/xwiki/objects/classes/BaseClass.java
xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/web/SaveAction.java 23 additions, 5 deletions

...m-oldcore/src/main/java/com/xpn/xwiki/web/SaveAction.java
xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/doc/XWikiDocumentMergeTest.java 0 additions, 422 deletions

...c/test/java/com/xpn/xwiki/doc/XWikiDocumentMergeTest.java
xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/internal/merge/MergeUtilsTest.java 0 additions, 144 deletions

...est/java/com/xpn/xwiki/internal/merge/MergeUtilsTest.java
xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/objects/BaseObjectTest.java 48 additions, 29 deletions

...e/src/test/java/com/xpn/xwiki/objects/BaseObjectTest.java
xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/objects/classes/BaseClassTest.java 31 additions, 0 deletions

...est/java/com/xpn/xwiki/objects/classes/BaseClassTest.java
xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-merge/pom.xml 6 additions, 19 deletions

...e/xwiki-platform-store/xwiki-platform-store-merge/pom.xml
xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-merge/src/main/resources/META-INF/components.txt 0 additions, 1 deletion

...rm-store-merge/src/main/resources/META-INF/components.txt
xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-merge/xwiki-platform-store-merge-api/pom.xml 63 additions, 0 deletions

...atform-store-merge/xwiki-platform-store-merge-api/pom.xml
xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-merge/xwiki-platform-store-merge-api/src/main/java/com/xpn/xwiki/doc/merge/CollisionException.java 0 additions, 0 deletions

...main/java/com/xpn/xwiki/doc/merge/CollisionException.java
xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-merge/xwiki-platform-store-merge-api/src/main/java/com/xpn/xwiki/doc/merge/MergeConfiguration.java 44 additions, 0 deletions

...main/java/com/xpn/xwiki/doc/merge/MergeConfiguration.java

with 346 additions and 1102 deletions

Please register or to comment