Branching

Scylla branches are named branch-x.y, for example branch-1.3. Release are tagged as scylla-x.y.z, for example scylla-1.3.0.

To create a branch, just create a regular git branch and push it:

$ git checkout -b branch-1.3
$ git push origin branch-1.3

to backport commits, make sure they have an asociated issue number, and cherry-pick the relevant commits:

$ git checkout branch-1.3
$ git cherry-pick -x commit-hash
$ git push origin branch-1.3

If a seastar commit needs to be backported, we first need a seastar branch. Because seastar is an independent project, we can't create branches there when we (ScyllaDB) want, so we create them in the https://github.com/scylladb/scylla-seastar repository:

# (in scylla directory)
$ git checkout branch-1.3
$ git submodule update
$ cd seastar
$ git remote add scylla-seastar git@github.com:scylladb/scylla-seastar
$ git checkout -b branch-1.3
$ git branch --set-upstream-to scylla-seastar/branch-1.3
$ git push scylla-seastar branch-1.3
$ cd ..

Now, update scylla to use the scylla-seastar repository for the seastar submodule:

$ vi .gitmodules
(change "url = ../seastar" to "url = ../seastar")
$ git add .gitmodules
$ git commit
$ git push origin branch-1.3