This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra-website.git
The following commit(s) were added to refs/heads/trunk by this push: new c99e80d57 Update How to commit page post CASSANDRA-18618 and 5.0 branch creation c99e80d57 is described below commit c99e80d57465640b438b0a8c4d8338224c90c454 Author: Ekaterina Dimitrova <ekaterina.dimitr...@datastax.com> AuthorDate: Wed Aug 9 15:23:49 2023 -0400 Update How to commit page post CASSANDRA-18618 and 5.0 branch creation patch by Ekaterina Dimitrova; reviewed by Michael Semb Wever for CASSANDRA-18738 --- .../ROOT/pages/development/how_to_commit.adoc | 54 +++++++++++++++------- 1 file changed, 38 insertions(+), 16 deletions(-) diff --git a/site-content/source/modules/ROOT/pages/development/how_to_commit.adoc b/site-content/source/modules/ROOT/pages/development/how_to_commit.adoc index ceb8ac243..383fcf605 100644 --- a/site-content/source/modules/ROOT/pages/development/how_to_commit.adoc +++ b/site-content/source/modules/ROOT/pages/development/how_to_commit.adoc @@ -14,12 +14,12 @@ Hypothetical CASSANDRA-12345 ticket is a cassandra-4.0 based bug fix that requires different code for cassandra-4.0, cassandra-4.1, and trunk. Contributor Jackie supplied a patch for the root branch (12345-4.0.patch), and patches for the remaining branches -(12345-4.1.patch, 12345-trunk.patch). +(12345-4.1.patch, 12345-5.0.patch, 12345-trunk.patch). On cassandra-4.0::: . `+git am -3 12345-4.0.patch+` (any problem b/c of CHANGES.txt not merging anymore, fix it in place) - . `+ant realclean && ant jar build-test+` (rebuild to make sure code + . `+ant realclean && ant jar+` (rebuild to make sure code compiles) . `+git commit --amend+` (Notice this will squash the 4.0 applied patch into the forward merge commit) @@ -27,22 +27,30 @@ On cassandra-4.1::: . `+git merge cassandra-4.0 -s ours --log+` . `+git apply -3 12345-4.1.patch+` (any issue with CHANGES.txt : fix and [.title-ref]#git add CHANGES.txt#) - . `+ant realclean && ant jar build-test+` (rebuild to make sure code + . `+ant realclean && ant jar+` (rebuild to make sure code compiles) . `+git commit --amend+` (Notice this will squash the 4.1 applied patch into the forward merge commit) +On cassandra-5.0::: +. `+git merge cassandra-4.1 -s ours --log+` +. `+git apply -3 12345-5.0.patch+` (any issue with CHANGES.txt : fix +and [.title-ref]#git add CHANGES.txt#) +. `+ant realclean && ant jar check+` (rebuild to make sure code +compiles) +. `+git commit --amend+` (Notice this will squash the 4.1 applied +patch into the forward merge commit) On trunk::: - . `+git merge cassandra-4.1 -s ours --log+` + . `+git merge cassandra-5.0 -s ours --log+` . `+git apply -3 12345-trunk.patch+` (any issue with CHANGES.txt : fix and [.title-ref]#git add CHANGES.txt#) - . `+ant realclean && ant jar build-test+` (rebuild to make sure code + . `+ant realclean && ant jar check+` (rebuild to make sure code compiles) . `+git commit --amend+` (Notice this will squash the trunk applied patch into the forward merge commit) On any branch::: - . `+git push origin cassandra-4.0 cassandra-4.1 trunk --atomic -n+` + . `+git push origin cassandra-4.0 cassandra-4.1 cassandra-5.0 trunk --atomic -n+` (dryrun check) - . `+git push origin cassandra-4.0 cassandra-4.1 trunk --atomic+` + . `+git push origin cassandra-4.0 cassandra-4.1 cassandra-5.0 trunk --atomic+` == Git branch based Contribution @@ -51,7 +59,7 @@ Same scenario, but a branch-based contribution: On cassandra-4.0::: . `+git cherry-pick <sha-of-4.0-commit>+` (any problem b/c of CHANGES.txt not merging anymore, fix it in place) - . `+ant realclean && ant jar build-test+` (rebuild to make sure code + . `+ant realclean && ant jar+` (rebuild to make sure code compiles) On cassandra-4.1::: . `+git merge cassandra-4.0 -s ours --log+` @@ -59,24 +67,34 @@ On cassandra-4.1::: format-patch and apply is [.title-ref]#cherry-pick -n#) . `+git apply -3 <sha-of-4.1-commit>.patch+` (any issue with CHANGES.txt : fix and [.title-ref]#git add CHANGES.txt#) - . `+ant realclean && ant jar build-test+` (rebuild to make sure code + . `+ant realclean && ant jar+` (rebuild to make sure code compiles) . `+git commit --amend+` (Notice this will squash the 4.1 applied patch into the forward merge commit) +On cassandra-5.0::: +. `+git merge cassandra-4.1 -s ours --log+` +. `+git format-patch -1 <sha-of-4.1-commit>+` (alternative to +format-patch and apply is [.title-ref]#cherry-pick -n#) +. `+git apply -3 <sha-of-5.0-commit>.patch+` (any issue with +CHANGES.txt : fix and [.title-ref]#git add CHANGES.txt#) +. `+ant realclean && ant jar check+` (rebuild to make sure code +compiles) +. `+git commit --amend+` (Notice this will squash the 5.0 applied +patch into the forward merge commit) On trunk::: - . `+git merge cassandra-4.1 -s ours --log+` + . `+git merge cassandra-5.0 -s ours --log+` . `+git format-patch -1 <sha-of-trunk-commit>+` (alternative to format-patch and apply is [.title-ref]#cherry-pick -n#) . `+git apply -3 <sha-of-trunk-commit>.patch+` (any issue with CHANGES.txt : fix and [.title-ref]#git add CHANGES.txt#) - . `+ant realclean && ant jar build-test+` (rebuild to make sure code + . `+ant realclean && ant jar check+` (rebuild to make sure code compiles) . `+git commit --amend+` (Notice this will squash the trunk applied patch into the forward merge commit) On any branch::: - . `+git push origin cassandra-4.0 cassandra-4.1 trunk --atomic -n+` + . `+git push origin cassandra-4.0 cassandra-4.1 cassandra-5.0 trunk --atomic -n+` (dryrun check) - . `+git push origin cassandra-4.0 cassandra-4.1 trunk --atomic+` + . `+git push origin cassandra-4.0 cassandra-4.1 cassandra-5.0 trunk --atomic+` == Contributions only for release branches @@ -86,15 +104,19 @@ If the patch is for an older branch, and doesn't impact later branches On cassandra-4.0::: . `+git cherry-pick <sha-of-4.0-commit>+` (any problem b/c of CHANGES.txt not merging anymore, fix it in place) - . `+ant realclean && ant jar build-test+` (rebuild to make sure code + . `+ant realclean && ant jar+` (rebuild to make sure code compiles) On cassandra-4.1::: . `+git merge cassandra-4.0 -s ours --log+` - . `+ant realclean && ant jar build-test+` (rebuild to make sure code + . `+ant realclean && ant jar+` (rebuild to make sure code compiles) +On cassandra-5.0::: +. `+git merge cassandra-4.1 -s ours --log+` +. `+ant realclean && ant jar check+` (rebuild to make sure code +compiles) On trunk::: . `+git merge cassandra-4.1 -s ours --log+` - . `+ant realclean && ant jar build-test+` (rebuild to make sure code + . `+ant realclean && ant jar check+` (rebuild to make sure code compiles) On any branch::: . `+git push origin cassandra-4.0 cassandra-4.1 trunk --atomic -n+` --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org