Another major issue that David-Sarah and the rest of us have to decide is whether to do the next release with both git and darcs in play or cut over entirely to git (#1644).
I drew attention to this situation by forgetting that we were supposed to push changes into trunk solely through darcs, and I committed some patches to fix #1692 to my personal tahoe-lafs git repo on github: https://github.com/zooko/tahoe-lafs/commit/19aaca73e6e751918ee8adfcbe973d500e95a539 https://github.com/zooko/tahoe-lafs/commit/3e0d6f9dcce8160acd4e76a3942781a4c6a65288 https://github.com/zooko/tahoe-lafs/commit/3c5c3c0282170e3ff247ea4dc8557d38e7ceb280 https://github.com/zooko/tahoe-lafs/commit/c87e4e048e2843618463588ccc14b232541dfa18 David-Sarah naturally didn't see this, so they went ahead and fixed the same issue slightly differently: https://tahoe-lafs.org/trac/tahoe-lafs/changeset/5455/trunk So this was duplicated effort, and it also means someone (me) has to manually merge tahoe-lafs trunk with my tahoe-lafs repo if they (I) don't want to throw away my changes. I note that the "how_to_make_a_tahoe-lafs_release.org" file, which was last touched by Brian while he was Release Manager for 1.9.0 and 1.9.1, now specifies to get all of the source code exclusively from git and not use darcs: https://tahoe-lafs.org/trac/tahoe-lafs/browser/trunk/docs/how_to_make_a_tahoe-lafs_release.org (That doesn't mean that we have to stop using darcs to *commit* patches.) Regards, Zooko tickets mentioned in this letter: https://tahoe-lafs.org/trac/tahoe-lafs/ticket/1644# move to git https://tahoe-lafs.org/trac/tahoe-lafs/ticket/1692# FTP frontend should not be more prominent than SFTP in any of the documentation _______________________________________________ tahoe-dev mailing list [email protected] http://tahoe-lafs.org/cgi-bin/mailman/listinfo/tahoe-dev
