-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 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. 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. 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 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAEBCAAGBQJTpISrAAoJEMtmZ+8tjWt594AP/3vWUnkvUgA1eCYL+P1L09nV zC7aSmGQ5LwiOomxntFGIK0xdw/zGkZYQnmtD7Z4QJDuNINTUHY9ke9Xl03e86jF R3+HsK8VhAkjOMVPGxzzmjOvGC8MAx3ltopxNV3cWRPmyvQzJ+msexTFwvFTIg4z YgUo9f54BjYkIV33DaptQUEuFP7FmIN4iAfaHftem8P2qFgATBWdc5ElN1jJeq7b Kx0fTo5mkNc0kLQI20rTGZi4UV3klfReX3ohelTTgPrUw8AZwCy4jiJS/PAZQDX1 baPna95sUimMJgsUF/6avchX6lRm5kOrFluQ3l4HSf8hDAezwt74Li80u0c/kb4I I0aMbJvmZ5xE1Zvk+9Xmm4D6R9m/eznBO/GKKwsqRM7OtZTsOomldI8bwbbx18ow z+809EXkEvPoxflQDIFxOXD9HWSaqINXiKThXphikTnbBIEouEi05TF1LluCokb/ cHwiR9eD3v7qk76a4HOOEupLmWub5muyHSEKNP64MpfKFp3UD37On4H4Hl2eMs2U 3ujnjTacf3TAZkYp1+FTluk1gRLN+Ja4YcIRwTM9KZOKjDuSQtWG7zQ7vJXqIpK9 IqniYdrVpIu+rxfKBrk2KTikqWSsDChg1bsoHGGxL/AJYIawOS5m+zXsSQtMwj7+ DoeKQxf2BxlT89Dy0m76 =EMxx -----END PGP SIGNATURE----- _______________________________________________ Devl mailing list Devl@freenetproject.org https://emu.freenetproject.org/cgi-bin/mailman/listinfo/devl
