Mirror of forum.nim-lang.org

4972 :: Nim git branch model

• jxy (orginal) [2019-06-26T23:52:43+02:00] view original

  What are the purposes of the git branches? I see devel is actively worked on (mostly bug fixes), version-0-20 is about a week old (some bug fixes from devel?), master is stuck in 0.19. What would be the hypothetical v1.0 branched off of?

---

• Araq (orginal) [2019-06-27T07:39:18+02:00] view original

  master is dead and should be removed, devel will become 0.21.0, version-0-20 will become 0.20.2. 0.20.x is much more likely to become v1 than 0.21.0 is.

---

• jxy (orginal) [2019-06-27T19:27:29+02:00] view original

  Thanks. Can we have the branch model documented somewhere?

  For now I will try to make sure our code is compatible to both devel and version-0-20.

---

• miran (orginal) [2019-06-27T20:21:39+02:00] view original

  devel is the main (trunk) branch. All the development (and pull requests) happens against that branch, and it is "cutting edge" -- Nim built from it has version 0.20.99.

  version-0-20 branch contains backported (cherry-picked) bugfixes from devel. Currently it is at version 0.20.1, which will become an official released stable version 0.20.2 and future backported bugfixes will be 0.20.3 until version 0.20.4 is released, and so on. (This is how it works generally; no guarantee that v0.20.4 will happen - v1.0 might be released before that)

  For now I will try to make sure our code is compatible to both devel and version-0-20.

  Since Nim v0.20.0 is basically v1.0RC1, the priority should be compatibility with the latest stable version and version-0-20 branch.

---

• jxy (orginal) [2019-09-23T17:47:42+02:00] view original

  Contrary to what has been said here, version-1-0 branched off devel, and version-0-20 looks dead to me.

  Congratulations anyway!

---