On 20/06/14 19:59, xor wrote: > On Friday, June 20, 2014 02:29:59 PM David Roden wrote: > > Good morning, > > > a more detailed explanation of the Git branching model we are reasonably > > close to can be found at > > http://nvie.com/posts/a-successful-git-branching-model/. > > I am fine with having a distinction between a stable branch "master" > and a > development branch "next" (or "develop" as that link calls it). I should > probably start doing this in WOT after the next release. > Feature branches are of course also useful because some new stuff usually > breaks compiling and other things while not finished. > The Release branches and hotfix branches which the site mentions seem to > introduce additional unneeded complexity though. I'm not doing releases now, but when I have done releases I have found release branches very helpful. It may take some time to fully test a release and people may be committing new stuff to next at the same time. > Most importantly, there is something which we should consider soon for > Freenet: Getting rid of the distinction between "official" and "staging" > repositories. This IMHO only stems from a lack of knowledge about all Git > features, namely signed tags, back when we switched to Git. > It only bloats the repository list and raises the entrance barrier for > new > developers. The main reason for this was so we could restrict access rights and thus limit the possibilities for vandalism. I.e. only RMs can push to the official repositories, which only contain official releases. Whereas *any* developer can fully rewrite the history or delete the repository completely with the staging repo. Granted this is fairly easy to recover from. > For the case of WOT, I never used the plugin-WoT-official repository > myself, so > I don't feel like anything could be lost if we deleted it. > I have also checked its state by diff-ing the tag list against > staging: Staging > contains more tags, official isn't even up to date - the build0013 tag is > missing. Official also only contains the master branch. > If anyone wants to delete the plugin-WoT-official repository, do it now :) > > FYI: You can do a really complete backup of the repository before > deleting it > with --mirror [1]: > > $ git clone --mirror https://github.com/freenet/plugin-WoT-official.git > > With regards to Freetalk, I haven't been working on it for a while, so > I would > like to postpone the restructuring of the repositories until I have > resumed > work on it and am familiar enough with the repository again to judge > whether > anything would be lost. So don't touch it please. > > [1] > http://stackoverflow.com/questions/4658451/can-a-local-git-clone-be-considered-a-complete-backup-of-the-repo-it-was-cloned
signature.asc
Description: OpenPGP digital signature
_______________________________________________ Devl mailing list Devl@freenetproject.org https://emu.freenetproject.org/cgi-bin/mailman/listinfo/devl
