[jira] [Updated] (OAK-1553) More sophisticated conflict resolution when concurrently adding nodes

2017-05-03 Thread Julian Reschke (JIRA) 

 [ 
https://issues.apache.org/jira/browse/OAK-1553?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Julian Reschke updated OAK-1553:

Component/s: segment-tar
 documentmk

> More sophisticated conflict resolution when concurrently adding nodes
> -
>
> Key: OAK-1553
> URL: https://issues.apache.org/jira/browse/OAK-1553
> Project: Jackrabbit Oak
>  Issue Type: Improvement
>  Components: core, documentmk, segment-tar
>Reporter: Michael Dürig
>Assignee: Michael Dürig
>  Labels: concurrency, scalability, technical_debt
> Attachments: OAK-1553.patch
>
>
> {{MicroKernel.rebase}} currently specifies: "addExistingNode: A node has been 
> added that is different from a node of them same name that has been added to 
> the trunk."
> This is somewhat troublesome in the case where the same node with different 
> but non conflicting child items is added concurrently:
> {code}
> f.add("fo").add("u1"); commit();
> f.add("fo").add("u2"); commit();
> {code}
> currently fails with a conflict because {{fo}} is not the same node for the 
> both cases. See discussion http://markmail.org/message/flst4eiqvbp4gi3z



--
This message was sent by Atlassian JIRA
(v6.3.15#6346)

[jira] [Updated] (OAK-1553) More sophisticated conflict resolution when concurrently adding nodes

2017-05-03 Thread Julian Reschke (JIRA) 

 [ 
https://issues.apache.org/jira/browse/OAK-1553?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Julian Reschke updated OAK-1553:

Component/s: (was: segment-tar)
 (was: mongomk)

> More sophisticated conflict resolution when concurrently adding nodes
> -
>
> Key: OAK-1553
> URL: https://issues.apache.org/jira/browse/OAK-1553
> Project: Jackrabbit Oak
>  Issue Type: Improvement
>  Components: core
>Reporter: Michael Dürig
>Assignee: Michael Dürig
>  Labels: concurrency, scalability, technical_debt
> Attachments: OAK-1553.patch
>
>
> {{MicroKernel.rebase}} currently specifies: "addExistingNode: A node has been 
> added that is different from a node of them same name that has been added to 
> the trunk."
> This is somewhat troublesome in the case where the same node with different 
> but non conflicting child items is added concurrently:
> {code}
> f.add("fo").add("u1"); commit();
> f.add("fo").add("u2"); commit();
> {code}
> currently fails with a conflict because {{fo}} is not the same node for the 
> both cases. See discussion http://markmail.org/message/flst4eiqvbp4gi3z



--
This message was sent by Atlassian JIRA
(v6.3.15#6346)

[jira] [Updated] (OAK-1553) More sophisticated conflict resolution when concurrently adding nodes

2016-12-22 Thread JIRA 

 [ 
https://issues.apache.org/jira/browse/OAK-1553?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Michael Dürig updated OAK-1553:
---
Labels: concurrency scalability technical_debt  (was: concurrency 
technical_debt)

> More sophisticated conflict resolution when concurrently adding nodes
> -
>
> Key: OAK-1553
> URL: https://issues.apache.org/jira/browse/OAK-1553
> Project: Jackrabbit Oak
>  Issue Type: Improvement
>  Components: core, mongomk, segment-tar
>Reporter: Michael Dürig
>Assignee: Michael Dürig
>  Labels: concurrency, scalability, technical_debt
> Attachments: OAK-1553.patch
>
>
> {{MicroKernel.rebase}} currently specifies: "addExistingNode: A node has been 
> added that is different from a node of them same name that has been added to 
> the trunk."
> This is somewhat troublesome in the case where the same node with different 
> but non conflicting child items is added concurrently:
> {code}
> f.add("fo").add("u1"); commit();
> f.add("fo").add("u2"); commit();
> {code}
> currently fails with a conflict because {{fo}} is not the same node for the 
> both cases. See discussion http://markmail.org/message/flst4eiqvbp4gi3z



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Updated] (OAK-1553) More sophisticated conflict resolution when concurrently adding nodes

2016-06-07 Thread JIRA 

 [ 
https://issues.apache.org/jira/browse/OAK-1553?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Michael Dürig updated OAK-1553:
---
Flagged:   (was: Impediment)

> More sophisticated conflict resolution when concurrently adding nodes
> -
>
> Key: OAK-1553
> URL: https://issues.apache.org/jira/browse/OAK-1553
> Project: Jackrabbit Oak
>  Issue Type: Improvement
>  Components: core, mongomk, segment-tar
>Reporter: Michael Dürig
>Assignee: Michael Dürig
>  Labels: concurrency, technical_debt
> Attachments: OAK-1553.patch
>
>
> {{MicroKernel.rebase}} currently specifies: "addExistingNode: A node has been 
> added that is different from a node of them same name that has been added to 
> the trunk."
> This is somewhat troublesome in the case where the same node with different 
> but non conflicting child items is added concurrently:
> {code}
> f.add("fo").add("u1"); commit();
> f.add("fo").add("u2"); commit();
> {code}
> currently fails with a conflict because {{fo}} is not the same node for the 
> both cases. See discussion http://markmail.org/message/flst4eiqvbp4gi3z



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Updated] (OAK-1553) More sophisticated conflict resolution when concurrently adding nodes

2016-06-07 Thread JIRA 

 [ 
https://issues.apache.org/jira/browse/OAK-1553?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Michael Dürig updated OAK-1553:
---
Flagged: Impediment

> More sophisticated conflict resolution when concurrently adding nodes
> -
>
> Key: OAK-1553
> URL: https://issues.apache.org/jira/browse/OAK-1553
> Project: Jackrabbit Oak
>  Issue Type: Improvement
>  Components: core, mongomk, segment-tar
>Reporter: Michael Dürig
>Assignee: Michael Dürig
>  Labels: concurrency, technical_debt
> Attachments: OAK-1553.patch
>
>
> {{MicroKernel.rebase}} currently specifies: "addExistingNode: A node has been 
> added that is different from a node of them same name that has been added to 
> the trunk."
> This is somewhat troublesome in the case where the same node with different 
> but non conflicting child items is added concurrently:
> {code}
> f.add("fo").add("u1"); commit();
> f.add("fo").add("u2"); commit();
> {code}
> currently fails with a conflict because {{fo}} is not the same node for the 
> both cases. See discussion http://markmail.org/message/flst4eiqvbp4gi3z



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Updated] (OAK-1553) More sophisticated conflict resolution when concurrently adding nodes

2016-04-20 Thread JIRA 

 [ 
https://issues.apache.org/jira/browse/OAK-1553?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Michael Dürig updated OAK-1553:
---
Component/s: (was: segmentmk)
 segment-next

> More sophisticated conflict resolution when concurrently adding nodes
> -
>
> Key: OAK-1553
> URL: https://issues.apache.org/jira/browse/OAK-1553
> Project: Jackrabbit Oak
>  Issue Type: Improvement
>  Components: core, mongomk, segment-next
>Reporter: Michael Dürig
>Assignee: Michael Dürig
>  Labels: concurrency, technical_debt
> Attachments: OAK-1553.patch
>
>
> {{MicroKernel.rebase}} currently specifies: "addExistingNode: A node has been 
> added that is different from a node of them same name that has been added to 
> the trunk."
> This is somewhat troublesome in the case where the same node with different 
> but non conflicting child items is added concurrently:
> {code}
> f.add("fo").add("u1"); commit();
> f.add("fo").add("u2"); commit();
> {code}
> currently fails with a conflict because {{fo}} is not the same node for the 
> both cases. See discussion http://markmail.org/message/flst4eiqvbp4gi3z



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Updated] (OAK-1553) More sophisticated conflict resolution when concurrently adding nodes

2016-01-19 Thread Marcel Reutegger (JIRA) 

 [ 
https://issues.apache.org/jira/browse/OAK-1553?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Marcel Reutegger updated OAK-1553:
--
Labels: concurrency technical_debt  (was: concurrency resilience 
scalability)

Moved to technical debt. I don't think this issue affects resilience. The 
system is still usable, but concurrency is limited.

> More sophisticated conflict resolution when concurrently adding nodes
> -
>
> Key: OAK-1553
> URL: https://issues.apache.org/jira/browse/OAK-1553
> Project: Jackrabbit Oak
>  Issue Type: Improvement
>  Components: core, mongomk, segmentmk
>Reporter: Michael Dürig
>Assignee: Michael Dürig
>  Labels: concurrency, technical_debt
> Attachments: OAK-1553.patch
>
>
> {{MicroKernel.rebase}} currently specifies: "addExistingNode: A node has been 
> added that is different from a node of them same name that has been added to 
> the trunk."
> This is somewhat troublesome in the case where the same node with different 
> but non conflicting child items is added concurrently:
> {code}
> f.add("fo").add("u1"); commit();
> f.add("fo").add("u2"); commit();
> {code}
> currently fails with a conflict because {{fo}} is not the same node for the 
> both cases. See discussion http://markmail.org/message/flst4eiqvbp4gi3z



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Updated] (OAK-1553) More sophisticated conflict resolution when concurrently adding nodes

2015-11-30 Thread Michael Marth (JIRA) 

 [ 
https://issues.apache.org/jira/browse/OAK-1553?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Michael Marth updated OAK-1553:
---

added this to DocMK resilience epic (because the corresponding sub-tasks cannot 
be linked to epics and the DocMK subtask seemed more pressing)

> More sophisticated conflict resolution when concurrently adding nodes
> -
>
> Key: OAK-1553
> URL: https://issues.apache.org/jira/browse/OAK-1553
> Project: Jackrabbit Oak
>  Issue Type: Improvement
>  Components: core, mongomk, segmentmk
>Reporter: Michael Dürig
>Assignee: Michael Dürig
>  Labels: concurrency, resilience, scalability
> Attachments: OAK-1553.patch
>
>
> {{MicroKernel.rebase}} currently specifies: "addExistingNode: A node has been 
> added that is different from a node of them same name that has been added to 
> the trunk."
> This is somewhat troublesome in the case where the same node with different 
> but non conflicting child items is added concurrently:
> {code}
> f.add("fo").add("u1"); commit();
> f.add("fo").add("u2"); commit();
> {code}
> currently fails with a conflict because {{fo}} is not the same node for the 
> both cases. See discussion http://markmail.org/message/flst4eiqvbp4gi3z



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Updated] (OAK-1553) More sophisticated conflict resolution when concurrently adding nodes

2015-10-20 Thread JIRA 

 [ 
https://issues.apache.org/jira/browse/OAK-1553?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Michael Dürig updated OAK-1553:
---
Fix Version/s: (was: 1.4)

> More sophisticated conflict resolution when concurrently adding nodes
> -
>
> Key: OAK-1553
> URL: https://issues.apache.org/jira/browse/OAK-1553
> Project: Jackrabbit Oak
>  Issue Type: Improvement
>  Components: core, mongomk, segmentmk
>Reporter: Michael Dürig
>Assignee: Michael Dürig
>  Labels: concurrency, resilience, scalability
> Attachments: OAK-1553.patch
>
>
> {{MicroKernel.rebase}} currently specifies: "addExistingNode: A node has been 
> added that is different from a node of them same name that has been added to 
> the trunk."
> This is somewhat troublesome in the case where the same node with different 
> but non conflicting child items is added concurrently:
> {code}
> f.add("fo").add("u1"); commit();
> f.add("fo").add("u2"); commit();
> {code}
> currently fails with a conflict because {{fo}} is not the same node for the 
> both cases. See discussion http://markmail.org/message/flst4eiqvbp4gi3z



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Updated] (OAK-1553) More sophisticated conflict resolution when concurrently adding nodes

2015-07-27 Thread JIRA 

 [ 
https://issues.apache.org/jira/browse/OAK-1553?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Michael Dürig updated OAK-1553:
---
Fix Version/s: (was: 1.3.5)
   1.4

 More sophisticated conflict resolution when concurrently adding nodes
 -

 Key: OAK-1553
 URL: https://issues.apache.org/jira/browse/OAK-1553
 Project: Jackrabbit Oak
  Issue Type: Improvement
  Components: core, mongomk, segmentmk
Reporter: Michael Dürig
Assignee: Michael Dürig
  Labels: concurrency, resilience, scalability
 Fix For: 1.4

 Attachments: OAK-1553.patch


 {{MicroKernel.rebase}} currently specifies: addExistingNode: A node has been 
 added that is different from a node of them same name that has been added to 
 the trunk.
 This is somewhat troublesome in the case where the same node with different 
 but non conflicting child items is added concurrently:
 {code}
 f.add(fo).add(u1); commit();
 f.add(fo).add(u2); commit();
 {code}
 currently fails with a conflict because {{fo}} is not the same node for the 
 both cases. See discussion http://markmail.org/message/flst4eiqvbp4gi3z



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Updated] (OAK-1553) More sophisticated conflict resolution when concurrently adding nodes

2015-05-29 Thread JIRA 

 [ 
https://issues.apache.org/jira/browse/OAK-1553?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Michael Dürig updated OAK-1553:
---
Fix Version/s: (was: 1.3.1)
   1.3.5

 More sophisticated conflict resolution when concurrently adding nodes
 -

 Key: OAK-1553
 URL: https://issues.apache.org/jira/browse/OAK-1553
 Project: Jackrabbit Oak
  Issue Type: Improvement
  Components: core, mongomk, segmentmk
Reporter: Michael Dürig
Assignee: Michael Dürig
  Labels: concurrency, scalability
 Fix For: 1.3.5

 Attachments: OAK-1553.patch


 {{MicroKernel.rebase}} currently specifies: addExistingNode: A node has been 
 added that is different from a node of them same name that has been added to 
 the trunk.
 This is somewhat troublesome in the case where the same node with different 
 but non conflicting child items is added concurrently:
 {code}
 f.add(fo).add(u1); commit();
 f.add(fo).add(u2); commit();
 {code}
 currently fails with a conflict because {{fo}} is not the same node for the 
 both cases. See discussion http://markmail.org/message/flst4eiqvbp4gi3z



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Updated] (OAK-1553) More sophisticated conflict resolution when concurrently adding nodes

2015-04-16 Thread JIRA 

 [ 
https://issues.apache.org/jira/browse/OAK-1553?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Michael Dürig updated OAK-1553:
---
Component/s: (was: mk)

 More sophisticated conflict resolution when concurrently adding nodes
 -

 Key: OAK-1553
 URL: https://issues.apache.org/jira/browse/OAK-1553
 Project: Jackrabbit Oak
  Issue Type: Improvement
  Components: core, mongomk, segmentmk
Reporter: Michael Dürig
Assignee: Michael Dürig
  Labels: concurrency
 Fix For: 1.3.1

 Attachments: OAK-1553.patch


 {{MicroKernel.rebase}} currently specifies: addExistingNode: A node has been 
 added that is different from a node of them same name that has been added to 
 the trunk.
 This is somewhat troublesome in the case where the same node with different 
 but non conflicting child items is added concurrently:
 {code}
 f.add(fo).add(u1); commit();
 f.add(fo).add(u2); commit();
 {code}
 currently fails with a conflict because {{fo}} is not the same node for the 
 both cases. See discussion http://markmail.org/message/flst4eiqvbp4gi3z



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Updated] (OAK-1553) More sophisticated conflict resolution when concurrently adding nodes

2015-03-26 Thread Michael Marth (JIRA) 

 [ 
https://issues.apache.org/jira/browse/OAK-1553?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Michael Marth updated OAK-1553:
---
Fix Version/s: (was: 1.4)
   1.3.1

 More sophisticated conflict resolution when concurrently adding nodes
 -

 Key: OAK-1553
 URL: https://issues.apache.org/jira/browse/OAK-1553
 Project: Jackrabbit Oak
  Issue Type: Improvement
  Components: core, mk, mongomk, segmentmk
Reporter: Michael Dürig
Assignee: Michael Dürig
  Labels: concurrency
 Fix For: 1.3.1

 Attachments: OAK-1553.patch


 {{MicroKernel.rebase}} currently specifies: addExistingNode: A node has been 
 added that is different from a node of them same name that has been added to 
 the trunk.
 This is somewhat troublesome in the case where the same node with different 
 but non conflicting child items is added concurrently:
 {code}
 f.add(fo).add(u1); commit();
 f.add(fo).add(u2); commit();
 {code}
 currently fails with a conflict because {{fo}} is not the same node for the 
 both cases. See discussion http://markmail.org/message/flst4eiqvbp4gi3z



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Updated] (OAK-1553) More sophisticated conflict resolution when concurrently adding nodes

2015-03-12 Thread JIRA 

 [ 
https://issues.apache.org/jira/browse/OAK-1553?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Michael Dürig updated OAK-1553:
---
Fix Version/s: (was: 1.2)
   1.4

 More sophisticated conflict resolution when concurrently adding nodes
 -

 Key: OAK-1553
 URL: https://issues.apache.org/jira/browse/OAK-1553
 Project: Jackrabbit Oak
  Issue Type: Improvement
  Components: core, mk, mongomk, segmentmk
Reporter: Michael Dürig
Assignee: Michael Dürig
  Labels: concurrency
 Fix For: 1.4

 Attachments: OAK-1553.patch


 {{MicroKernel.rebase}} currently specifies: addExistingNode: A node has been 
 added that is different from a node of them same name that has been added to 
 the trunk.
 This is somewhat troublesome in the case where the same node with different 
 but non conflicting child items is added concurrently:
 {code}
 f.add(fo).add(u1); commit();
 f.add(fo).add(u2); commit();
 {code}
 currently fails with a conflict because {{fo}} is not the same node for the 
 both cases. See discussion http://markmail.org/message/flst4eiqvbp4gi3z



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Updated] (OAK-1553) More sophisticated conflict resolution when concurrently adding nodes

2014-10-08 Thread Marcel Reutegger (JIRA) 

 [ 
https://issues.apache.org/jira/browse/OAK-1553?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Marcel Reutegger updated OAK-1553:
--
Fix Version/s: (was: 1.1.1)
   1.2

 More sophisticated conflict resolution when concurrently adding nodes
 -

 Key: OAK-1553
 URL: https://issues.apache.org/jira/browse/OAK-1553
 Project: Jackrabbit Oak
  Issue Type: Improvement
  Components: core, mk, mongomk, segmentmk
Reporter: Michael Dürig
Assignee: Michael Dürig
  Labels: concurrency
 Fix For: 1.2

 Attachments: OAK-1553.patch


 {{MicroKernel.rebase}} currently specifies: addExistingNode: A node has been 
 added that is different from a node of them same name that has been added to 
 the trunk.
 This is somewhat troublesome in the case where the same node with different 
 but non conflicting child items is added concurrently:
 {code}
 f.add(fo).add(u1); commit();
 f.add(fo).add(u2); commit();
 {code}
 currently fails with a conflict because {{fo}} is not the same node for the 
 both cases. See discussion http://markmail.org/message/flst4eiqvbp4gi3z



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Updated] (OAK-1553) More sophisticated conflict resolution when concurrently adding nodes

2014-09-30 Thread Amit Jain (JIRA) 

 [ 
https://issues.apache.org/jira/browse/OAK-1553?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Amit Jain updated OAK-1553:
---
Fix Version/s: (was: 1.1)
   1.1.1

 More sophisticated conflict resolution when concurrently adding nodes
 -

 Key: OAK-1553
 URL: https://issues.apache.org/jira/browse/OAK-1553
 Project: Jackrabbit Oak
  Issue Type: Improvement
  Components: core, mk, mongomk, segmentmk
Reporter: Michael Dürig
Assignee: Michael Dürig
  Labels: concurrency
 Fix For: 1.1.1

 Attachments: OAK-1553.patch


 {{MicroKernel.rebase}} currently specifies: addExistingNode: A node has been 
 added that is different from a node of them same name that has been added to 
 the trunk.
 This is somewhat troublesome in the case where the same node with different 
 but non conflicting child items is added concurrently:
 {code}
 f.add(fo).add(u1); commit();
 f.add(fo).add(u2); commit();
 {code}
 currently fails with a conflict because {{fo}} is not the same node for the 
 both cases. See discussion http://markmail.org/message/flst4eiqvbp4gi3z



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Updated] (OAK-1553) More sophisticated conflict resolution when concurrently adding nodes

2014-03-19 Thread JIRA 

 [ 
https://issues.apache.org/jira/browse/OAK-1553?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Michael Dürig updated OAK-1553:
---

Fix Version/s: 0.20

 More sophisticated conflict resolution when concurrently adding nodes
 -

 Key: OAK-1553
 URL: https://issues.apache.org/jira/browse/OAK-1553
 Project: Jackrabbit Oak
  Issue Type: Improvement
  Components: core, mk, mongomk, segmentmk
Reporter: Michael Dürig
Assignee: Michael Dürig
 Fix For: 0.20


 {{MicroKernel.rebase}} currently specifies: addExistingNode: A node has been 
 added that is different from a node of them same name that has been added to 
 the trunk.
 This is somewhat troublesome in the case where the same node with different 
 but non conflicting child items is added concurrently:
 {code}
 f.add(fo).add(u1); commit();
 f.add(fo).add(u2); commit();
 {code}
 currently fails with a conflict because {{fo}} is not the same node for the 
 both cases. See discussion http://markmail.org/message/flst4eiqvbp4gi3z



--
This message was sent by Atlassian JIRA
(v6.2#6252)

[jira] [Updated] (OAK-1553) More sophisticated conflict resolution when concurrently adding nodes

2014-03-19 Thread JIRA 

 [ 
https://issues.apache.org/jira/browse/OAK-1553?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Michael Dürig updated OAK-1553:
---

Attachment: OAK-1553.patch

Attached patch implements the more sophisticated merging for 
{{AbstractRebaseDiff}} (in memory implementation) as sketched above. All test 
cases still pass.

 More sophisticated conflict resolution when concurrently adding nodes
 -

 Key: OAK-1553
 URL: https://issues.apache.org/jira/browse/OAK-1553
 Project: Jackrabbit Oak
  Issue Type: Improvement
  Components: core, mk, mongomk, segmentmk
Reporter: Michael Dürig
Assignee: Michael Dürig
 Fix For: 0.20

 Attachments: OAK-1553.patch


 {{MicroKernel.rebase}} currently specifies: addExistingNode: A node has been 
 added that is different from a node of them same name that has been added to 
 the trunk.
 This is somewhat troublesome in the case where the same node with different 
 but non conflicting child items is added concurrently:
 {code}
 f.add(fo).add(u1); commit();
 f.add(fo).add(u2); commit();
 {code}
 currently fails with a conflict because {{fo}} is not the same node for the 
 both cases. See discussion http://markmail.org/message/flst4eiqvbp4gi3z



--
This message was sent by Atlassian JIRA
(v6.2#6252)