Moving over to dev... The Radiance source mirror on NREL's GitHub site is a dumb, one-way mirror. We use it to make the process of building and hosting Radiance installers, and that's about it. The CVS is still the home of Radiance, and that is where code changes are checked in, generally by Greg and sometimes by Roland now. On the rare occasions I actually do something to the Radiance code, I make my changes to combined and make a diff off that which I send to Greg and he merges into the CVS. Our Git bot updates the mirror hourly, at which time I revert to the last checkout and pull again, and off I go. I do make release tags on GitHib for the packages, but that's about it. Some people have used the Git issues to report, uh, issues, as well. But generally speaking the flow of code is one way, from CVS to Git.
As to why branch "master" is so out of date: master dates to the time when we started the mirror. From the outset the intent was to have a separate branch from which to develop the CMake system, and the Windows version of rvu. The developers responsible for the CMake work set it up this way, and when we moved the mirror crap to NREL we just left it as is. It all Just Works, provided you know about the whole 'combined' branch thing. Now then, what are you trying to do, Randolph? What changes do you have that you wanted to merge? Again, you wouldn't merge them to NREL/GitHub, they'd need to go to Greg. You could also fork the NREL repo and do whatever you wanted, I suppose. - Rob On 2/8/16, 11:46 PM, "Randolph M. Fritz" <rmfri...@gmail.com<mailto:rmfri...@gmail.com>> wrote: Seems if I follow "git clone https://github.com/NREL/Radiance/"; with "git checkout combined" that does the job. How I would merge my local "combined" branch with the github respository (should I have changes and the permission to merge them) I don't understand, but then there's lots of things about git I don't understand. (And I suppose we ought to move this discussion to the development list, bah!) -- Randolph On Mon, Feb 8, 2016 at 7:55 PM, Randolph M. Fritz <rmfri...@gmail.com<mailto:rmfri...@gmail.com>> wrote: Oh, I see. I did the regular generic github download and got the wrong branch. Why is "master" so far out of date? On Feb 8, 2016 7:46 PM, "Guglielmetti, Robert" <robert.guglielme...@nrel.gov<mailto:robert.guglielme...@nrel.gov>> wrote: To be clear Randolph, the "combined" branch is the one that's kept up to date with the CVS repository. Branch "master" is ancient. As the link Nathaniel posted shows, the combined branch has the evalglare source, and the CMake files include it in the build and package targets: https://github.com/NREL/Radiance/blob/combined/src/util/CMakeLists.txt#L101-L104 Matter of fact (file under: I love GitHub): https://github.com/NREL/Radiance/commit/dde95dd17644c0fe8e6849ded9ee48498a5487ba - Rob On 2/8/16, 8:18 PM, "Rob Guglielmetti" <rob.guglielme...@gmail.com<mailto:rob.guglielme...@gmail.com><mailto:rob.guglielme...@gmail.com<mailto:rob.guglielme...@gmail.com>>> wrote: Yeah, whatcha talking about? On Mon, Feb 8, 2016 at 7:03 PM, Randolph M. Fritz <rmfri...@gmail.com<mailto:rmfri...@gmail.com><mailto:rmfri...@gmail.com<mailto:rmfri...@gmail.com>>> wrote: What's up with this? -- Randolph M. Fritz, Lighting Design and Simulation +1 206 659-8617<tel:%2B1%20206%20659-8617><tel:%2B1%20206%20659-8617> || rmfri...@gmail.com<mailto:rmfri...@gmail.com><mailto:rmfri...@gmail.com<mailto:rmfri...@gmail.com>> _______________________________________________ Radiance-general mailing list radiance-gene...@radiance-online.org<mailto:radiance-gene...@radiance-online.org><mailto:radiance-gene...@radiance-online.org<mailto:radiance-gene...@radiance-online.org>> http://www.radiance-online.org/mailman/listinfo/radiance-general _______________________________________________ Radiance-general mailing list radiance-gene...@radiance-online.org<mailto:radiance-gene...@radiance-online.org> http://www.radiance-online.org/mailman/listinfo/radiance-general _______________________________________________ Radiance-dev mailing list Radiance-dev@radiance-online.org http://www.radiance-online.org/mailman/listinfo/radiance-dev
