On 12/11/2012 04:56 PM, Michal Babej wrote: > On Tue, 11 Dec 2012 11:48:14 +0100 > Togan Muftuoglu <[email protected]> wrote: > >> So all new development is happening now in this master branch. I must >> admit I am either not awake yet, or having difficulty in grasping the >> git layout of darktable. >> > > If i understand it correctly: > > master --- 1.0 -------------------------------------- 1.1 --- ... > \ \ > \ \ > (darktable-1.0.x branch) (darktable-1.1.x branch) > \ \ > \ \ > 1.0.1 bug fix release 1 1.1.1 bug fix rel. 1 > \ > \ > \ > ... 1.0.N bug fix release N > > Not really complicated... commits into the darktable-1.1.x branch are > *currently* cherry-picked from master, so master currently should also > contain everything that is in 1.1.x branch. > > Perhaps now would be a good time (well actually it should have happened > right after creating 1.1.x branch) to go even/odd versioning and change > master to 1.3 ?
Thanks for the info, was helpful, but I think Pascal and I are on the same boat as for providing a nightly release based on the git master one , at least speaking of myself, tries to get a version based on the git describe and as far as I can tell this is the same logic used by the create_release.sh in the tools directory. For the time being I am just changing the archive to be 1.1.1_gitshawhatever and using this as the versioning for my nightly builds Togan ------------------------------------------------------------------------------ LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial Remotely access PCs and mobile devices and provide instant support Improve your efficiency, and focus on delivering more value-add services Discover what IT Professionals Know. Rescue delivers http://p.sf.net/sfu/logmein_12329d2d _______________________________________________ darktable-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/darktable-devel
