[
https://issues.apache.org/jira/browse/CASSANDRA-18204?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17684041#comment-17684041
]
David Capwell commented on CASSANDRA-18204:
-------------------------------------------
ok, Caleb found an issue with git pull when 2 authors commit at the same
time...
Let's say you make a cross cutting change, so change C* and accord. Locally you
commit accord then commit C* (including the change to latest SHA). You then do
the push and git blocks due to conflict (we made submodules do --atomic push).
You pull in the changes and push again and locally everything is great, but if
you do not cleanup that failed C* commit, then there is a commit pointing to a
accord commit that doesn't exist...
It might be possible to detect this and reject... I can look into pre-commit
hooks to see if I can know what files are committed... we could enforce a
property that you can't commit C* until accord is pushed...
> CEP-15: (C*) Add git submodule for Accord
> -----------------------------------------
>
> Key: CASSANDRA-18204
> URL: https://issues.apache.org/jira/browse/CASSANDRA-18204
> Project: Cassandra
> Issue Type: Task
> Components: Accord
> Reporter: David Capwell
> Assignee: David Capwell
> Priority: Normal
> Fix For: 4.x
>
> Time Spent: 1h 40m
> Remaining Estimate: 0h
>
> As talked about in dev@ thread "Intra-project dependencies”, we talked about
> adding git submodules but before doing this had to work out a few issues
> first; this ticket is to track this work.
> Goals
> * when checking out an older commit, or pulling in newer commits, the
> submodule should also be updated automatically
> * release artifact must include the submodule and must be able to build
> without issue
> * build.xml must be updated to build the submodule
> * build.xml must be updated to release the submodule jar
--
This message was sent by Atlassian Jira
(v8.20.10#820010)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
