XSF Editor Team - 2022-01-07


  1. tmolitor

    jonas’ what is missing before this can be merged? https://github.com/xsf/xeps/pull/1128

  2. jonas’

    tmolitor, thanks for asking

  3. jonas’

    https://github.com/xsf/xeps/pull/1142 and #1128 look very similar

  4. jonas’

    so it's not clear to me what to do here

  5. tmolitor

    1142 contains one more commit not in 1128, it is intended to bemerged on top ov 1128

  6. jonas’

    ah

  7. jonas’

    please mark 1142 as draft until 1128 is merged

  8. tmolitor

    okay, I'll do

  9. jonas’

    in addition, 1128 commit history needs cleaning up: it adds a revision block, but not in the recentmost commit.

  10. jonas’

    when adding a revision block, it must be added in the recentmost commit, otherwise it is ambiguous what the revision really contains

  11. tmolitor

    okay, I'll do

  12. tmolitor

    I can squash all commits into one if that is okay

  13. jonas’

    I suppose in this case that's okay

  14. tmolitor

    okay

  15. tmolitor

    done

  16. tmolitor

    I rebased both other PRs upon thesquashed one now

  17. jonas’

    tmolitor, LGTM now, I'll take care of it next tuesday

  18. jonas’

    (unless you have constraints which raise the urgency)

  19. tmolitor

    No, no constraints other than the one that this change is waiting to geht merged for a couple of weeks now ;)

  20. tmolitor

    jonas’: -^

  21. jonas’

    right, tuesday it is :)

  22. tmolitor

    perfect :)