New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implementation of ComplexMergResolver #90

Open
wants to merge 8 commits into
base: 8.x-1.x
from

Conversation

Projects
None yet
2 participants
@rakesh-verma-16
Contributor

rakesh-verma-16 commented Aug 12, 2016

No description provided.

Show outdated Hide outdated multiversion.services.yml
conflict.complexmerge_resolver:
class: Drupal\multiversion\Entity\Index\ComplexMergeResolver
tags:
- { name: merge_resolver, priority: 20}

This comment has been minimized.

@rakesh-verma-16

rakesh-verma-16 Aug 12, 2016

Contributor

Will add space in between 20 and closing parentheses

@rakesh-verma-16

rakesh-verma-16 Aug 12, 2016

Contributor

Will add space in between 20 and closing parentheses

Show outdated Hide outdated src/Entity/Index/ComplexMergeResolver.php
$r2_array = $this->normalize($revision2, 'array');
$r3_array = $this->normalize($revision3, 'array');
public function merge(RevisionableInterface $revision1, RevisionableInterface $revision2, RevisionableInterface $revision3) {
$r1_array = \Drupal::service('serializer')->normalize($revision1);

This comment has been minimized.

@rakesh-verma-16

rakesh-verma-16 Aug 12, 2016

Contributor

will fix it.

@rakesh-verma-16

rakesh-verma-16 Aug 12, 2016

Contributor

will fix it.

@@ -2,8 +2,15 @@
"name": "drupal/multiversion",
"description": "Extends the revision support for content entities.",
"type": "drupal-module",
"repositories": [

This comment has been minimized.

@jeqq

jeqq Aug 15, 2016

Collaborator

You can remove this, I've added relaxedws/merge library to packagist.

@jeqq

jeqq Aug 15, 2016

Collaborator

You can remove this, I've added relaxedws/merge library to packagist.

This comment has been minimized.

@rakesh-verma-16

rakesh-verma-16 Aug 15, 2016

Contributor

Okay, I will in next commit.

@rakesh-verma-16

rakesh-verma-16 Aug 15, 2016

Contributor

Okay, I will in next commit.

@rakesh-verma-16

This comment has been minimized.

Show comment
Hide comment
@rakesh-verma-16

rakesh-verma-16 Nov 30, 2016

Contributor

Can we fix this PR?

Contributor

rakesh-verma-16 commented Nov 30, 2016

Can we fix this PR?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment