<br> <br><br>> In my<br>> opinion, the other projects (git, linux, jquery, et al.) are not doing<br>> things oddly at all. I think it makes good sense that branches are<br>> temporary - places for feature development (or release work). We're<br>
> not going to be maintaining divergent lines of development.<br><br>That makes perfect sense to me.<br><br><br>> If you want to re-create a branch from any commit (using, for example<br>> a tag name), it is trivial.<br>
><br>> git checkout -b oldstuff release-1.0<br>><br>> And there you have the full history of what was the 1.0 branch. From<br>> there you could make a fix and release 1.0.1<br><br>Yes.<br><br><br>Here are the steps that I see for a 1.0 release:<br>
<br>#1 release 1.0-rc1<br>#2 release 1.0-rc2<br>#3 release 1.0<br>#4 release 1.0.1<br><br>We start the release process by creating a 1.0 branch off the master branch.<br><br>For #1 we just create a 1.0-rc1 tag to the HEAD of the 1.0 branch (which is the same as the HEAD of master).<br>
<br>Between rc1 and rc2 changes for 1.0 are committed to the 1.0 branch, which can regularly be merged into master (possibly for every commit). Changes that aren't for 1.0 are committed to the master branch.<br><br>For #2 we merge the 1.0 branch into master, and create a 1.0-rc2 tag to the HEAD of the 1.0 branch.<br>
<br>For #3 we create a 1.0 tag to the HEAD of the 1.0 branch, and delete the 1.0 branch.<br><br>For #4 we create a branch off the 1.0 tag, commit to that branch, create a 1.0.1 tag to the HEAD of the branch, merge the branch into master, and delete the branch.<br>
<br>I may be forgetting important details here, but this is the high-level view I currently have about the release process. Practical experiments will reveal these details.<br><br><br>Sorry for going into more details in this thread. I'm happy to take that discussion in a new thread if people think it'd be more appropriate.<br>
<br>Cheers,<br><br><br>-- <br>Eric Lemoine<br><br>Camptocamp France SAS<br>Savoie Technolac, BP 352<br>73377 Le Bourget du Lac, Cedex<br><br>Tel : 00 33 4 79 44 44 96<br>Mail : <a href="mailto:eric.lemoine@camptocamp.com">eric.lemoine@camptocamp.com</a><br>
<a href="http://www.camptocamp.com">http://www.camptocamp.com</a><br><br>