Skip to content
Snippets Groups Projects

Inheriting association info on master

Definitions can now inherit association rules from their base definitions. This required the concept of local association rules to be added to the Definition class.

Backport: release:HEAD^2

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Errors:

    • commit b943dd21 is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/PublicPointerDefs.h, smtk/attribute/testing/cxx/basicAttributeXMLWriterTest.cxx, smtk/attribute/testing/cxx/childrenItemsTest.cxx. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    Please rewrite commits to fix the errors listed above (adding fixup commits will not resolve the errors) and force-push the branch again to update the merge request.

  • Errors:

    • commit c4e4e483 is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/PublicPointerDefs.h. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.
    • commit b943dd21 is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/PublicPointerDefs.h, smtk/attribute/testing/cxx/basicAttributeXMLWriterTest.cxx, smtk/attribute/testing/cxx/childrenItemsTest.cxx. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    Please rewrite commits to fix the errors listed above (adding fixup commits will not resolve the errors) and force-push the branch again to update the merge request.

  • Do: test --merged

  • This merge request has been queued for testing. Test results may be viewed on:

    • CDash (release)
    • CDash (master)
    • Buildbot (release) (only visible from inside Kitware)
    • Buildbot (master) (only visible from inside Kitware)

    Branch-at-release: ff141a87
    Branch-at-master: 7620feab

  • Do: reformat

  • This topic has been reformatted and pushed; please fetch from the source repository and reset your local branch to continue with further development on the reformatted commits.

  • Kitware Robot added 2 commits

    added 2 commits

    • 6bd1df3b - ENH: Adding ability to inherit association rules
    • 277d1494 - Merge branch 'inheritingAssociationInfo' into inheritingAssociationInfoOnMaster

    Compare with previous version

  • added 1 commit

    • 852d9934 - Merge branch 'inheritingAssociationInfo' into inheritingAssociationInfoOnMaster

    Compare with previous version

  • Do: test --merged

  • This merge request has been queued for testing. Test results may be viewed on:

    • CDash (release)
    • CDash (master)
    • Buildbot (release) (only visible from inside Kitware)
    • Buildbot (master) (only visible from inside Kitware)

    Branch-at-release: f5baedd8
    Branch-at-master: 96eb0853

  • added 1 commit

    • 11bd5eba - Merge branch 'inheritingAssociationInfo' into inheritingAssociationInfoOnMaster

    Compare with previous version

  • Errors:

    • commit 11bd5eba is not allowed because the following files are not formatted according to the 'autopep8' check: smtk/attribute/testing/python/basicAttributeXMLWriterTest.py. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    Please rewrite commits to fix the errors listed above (adding fixup commits will not resolve the errors) and force-push the branch again to update the merge request.

  • added 1 commit

    • ab7fd9af - Merge branch 'inheritingAssociationInfo' into inheritingAssociationInfoOnMaster

    Compare with previous version

  • Errors:

    • commit ab7fd9af is not allowed because the following files are not formatted according to the 'autopep8' check: smtk/attribute/testing/python/basicAttributeXMLWriterTest.py. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    Please rewrite commits to fix the errors listed above (adding fixup commits will not resolve the errors) and force-push the branch again to update the merge request.

  • Do: test --merged

  • This merge request has been queued for testing. Test results may be viewed on:

    • CDash (release)
    • CDash (master)
    • Buildbot (release) (only visible from inside Kitware)
    • Buildbot (master) (only visible from inside Kitware)

    Branch-at-release: d1849c39
    Branch-at-master: a5be0ff4

  • Do: test --merged

  • This merge request has been queued for testing. Test results may be viewed on:

    • CDash (release)
    • CDash (master)
    • Buildbot (release) (only visible from inside Kitware)
    • Buildbot (master) (only visible from inside Kitware)

    Branch-at-release: 0cdb5ecc
    Branch-at-master: ae87ad82

  • Do: test --merged

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
Please register or sign in to reply
Loading