Code

WIP: Add Atomic Graph#262

Code

Draft

Simaris wants to merge 15 commits intoAKSW:masterAKSW/QuitStore:masterfrom Simaris:feature/AtomicGraphSimaris/QuitStore:feature/AtomicGraphCopy head branch name to clipboard

+756-93

Commits

Commits on Nov 27, 2020

• added atomic graphs experimental to the update routine

  Simaris

  committed
  b764994

• broken merge with atomic graphs

  Simaris

  committed
  4061dc4

Commits on Dec 1, 2020

• first three-way merge with atomic-graphs

  Simaris

  committed
  95a068c

Commits on Dec 3, 2020

• threeway merge ready

  Simaris

  committed
  ff783f7

Commits on Dec 7, 2020

• context merge without naming

  Simaris

  committed
  034ba9d

Commits on Dec 13, 2020

• context and three-way now preserve blanknode Names

  

  SZ

  committed
  a6545dc

Commits on Dec 17, 2020

• broken tests

  

  SZ

  committed
  9a4efab

Commits on Dec 18, 2020

• Added a skeleton for merge tests

  Simaris

  committed
  c62ba41

Commits on Dec 19, 2020

• first working AtomicGraphs test

  Simaris

  committed
  f7d0e1e

Commits on Dec 27, 2020

• incomplete Tests for merge methods

  Simaris

  committed
  ea51d95

Commits on Dec 28, 2020

• three-way merge test works

  Simaris

  committed
  ac133d4

• most merge tests do not fail, with one exception

  Simaris

  committed
  dd21cbe

Commits on Jan 6, 2021

• registered merge tests in .travis.yml

  Simaris

  committed
  6a7a278

Commits on Jan 7, 2021

• removed problematic update part

  Simaris

  committed
  d5da755

Commits on Feb 10, 2021

• update the >>update<< function to reuse BlankNode labels to refer to the same BlankNode

  Simaris

  committed
  6bc4b6e