Skip to content
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.

Sign up for GitHub

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

Jump to bottom

WIP: Add Atomic Graph #262

Draft
wants to merge 15 commits into
base: master
Choose a base branch
from
Draft

WIP: Add Atomic Graph #262

wants to merge 15 commits into from

Commits on Nov 27, 2020

  1. added atomic graphs experimental to the update routine

    @Simaris
    Simaris committed Nov 27, 2020
    Configuration menu
    Copy the full SHA
    b764994 View commit details
    Browse the repository at this point in the history

  2. broken merge with atomic graphs

    @Simaris
    Simaris committed Nov 27, 2020
    Configuration menu
    Copy the full SHA
    4061dc4 View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2020

  1. first three-way merge with atomic-graphs

    @Simaris
    Simaris committed Dec 1, 2020
    Configuration menu
    Copy the full SHA
    95a068c View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2020

  1. threeway merge ready

    @Simaris
    Simaris committed Dec 3, 2020
    Configuration menu
    Copy the full SHA
    ff783f7 View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2020

  1. context merge without naming

    @Simaris
    Simaris committed Dec 7, 2020
    Configuration menu
    Copy the full SHA
    034ba9d View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2020

  1. context and three-way now preserve blanknode Names

    SZ committed Dec 13, 2020
    Configuration menu
    Copy the full SHA
    a6545dc View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2020

  1. broken tests

    SZ committed Dec 17, 2020
    Configuration menu
    Copy the full SHA
    9a4efab View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2020

  1. Added a skeleton for merge tests

    @Simaris
    Simaris committed Dec 18, 2020
    Configuration menu
    Copy the full SHA
    c62ba41 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2020

  1. first working AtomicGraphs test

    @Simaris
    Simaris committed Dec 19, 2020
    Configuration menu
    Copy the full SHA
    f7d0e1e View commit details
    Browse the repository at this point in the history

Commits on Dec 27, 2020

  1. incomplete Tests for merge methods

    @Simaris
    Simaris committed Dec 27, 2020
    Configuration menu
    Copy the full SHA
    ea51d95 View commit details
    Browse the repository at this point in the history

Commits on Dec 28, 2020

  1. three-way merge test works

    @Simaris
    Simaris committed Dec 28, 2020
    Configuration menu
    Copy the full SHA
    ac133d4 View commit details
    Browse the repository at this point in the history

  2. most merge tests do not fail, with one exception

    @Simaris
    Simaris committed Dec 28, 2020
    Configuration menu
    Copy the full SHA
    dd21cbe View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2021

  1. registered merge tests in .travis.yml

    @Simaris
    Simaris committed Jan 6, 2021
    Configuration menu
    Copy the full SHA
    6a7a278 View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2021

  1. removed problematic update part

    @Simaris
    Simaris committed Jan 7, 2021
    Configuration menu
    Copy the full SHA
    d5da755 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2021

  1. update the >>update<< function to reuse BlankNode labels to refer to … 

    …the same BlankNode
    @Simaris
    Simaris committed Feb 10, 2021
    Configuration menu
    Copy the full SHA
    6bc4b6e View commit details
    Browse the repository at this point in the history