On 2014-08-15 21:19-0400 Hazen Babcock wrote: > On 8/13/2014 4:38 PM, phil rosenberg wrote: >> The impression I get from reading the docs and the post you linked Alan, is >> that there is a tendency for people coming from svn to forget that git is a >> distributed vcs. Perhaps some of these branches would be more at home in >> the various developers own repositories. I cloned the repository today and >> already generated two branches - partly to see how it works, but partly >> because it is so useful to be able to do so. > > Yes, I think we have agreed that the only branches in the SF repo should be > "master", "next" and "release". All the other branches can live on cloned > repos depending on user preference. If multiple people are going to work on > them then they should be in a shared but "private" repo, not in the SF repo. > >> That said, if for example you clone the repository now and continue to >> develop the cmake_test branch, but that branch gets deleted from the SF >> repository, does that make it really painful to merge it back in? I have a >> feeling the answer might be yes but I'm not sure. > > The fact that it has been removed from theS F repo should not be an issue. I > don't think this is really any different from a topic branch which never > existed in the repo in the first place.
The above words made me double check that test_cmake has not been removed from the SF repo. I was very glad to see it (and the other weird branches) still there. Here is why. The test_cmake branch contains a lot of mundane test subprojects that test various aspects of CMake which are of little interest any more plus one interesting subproject called "test_ada" that should remain public since it tests all aspects of the CMake Ada language support facilities I developed as part of PLplot but which are of interest to others and which do need testing with "test_ada" fairly often and which require some maintenance on the rare occasions when that testing fails. Subversion branches could be used for absolutely any purpose, but in git with higher expectations of what branches mean, I think it makes no sense to keep this test_ada miniproject as part of a separate branch, and instead it should be located in a subdirectory of PLplot's cmake directory (similar to to the mini-project cmake/epa_build) in the master branch. So making that so and removing the test_cmake branch that contains test_ada is part of my future git plans. Furthermore, I would like some time to at least do a quick survey to make sure there are no other obvious "hidden gems" like test_ada located in what were subversion branches subdirectories before the corresponding branches are removed from the git repo. I do agree removal of all these weird (from the git point of view) branches is an excellent future goal so long as we have a fool-proof permanent way to resurrect those branches (even just for the purpose of understanding the early history of PLplot if someone becomes interested in that down the road). So is there such a method? For example, I asked before whether specially named tags (e.g., "historical_subversion_branch_test_cmake") constituted a permanent record that could be used as the basis of a fool-proof method of resurrecting all deleted subversion branches. However, that git question may have gotten lost in the shuffle because so far I haven't received a response. Alan __________________________ Alan W. Irwin Astronomical research affiliation with Department of Physics and Astronomy, University of Victoria (astrowww.phys.uvic.ca). Programming affiliations with the FreeEOS equation-of-state implementation for stellar interiors (freeeos.sf.net); the Time Ephemerides project (timeephem.sf.net); PLplot scientific plotting software package (plplot.sf.net); the libLASi project (unifont.org/lasi); the Loads of Linux Links project (loll.sf.net); and the Linux Brochure Project (lbproject.sf.net). __________________________ Linux-powered Science __________________________ ------------------------------------------------------------------------------ _______________________________________________ Plplot-devel mailing list Plplot-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/plplot-devel
