Thanks very much. It would be nice if this info were somewhere, e.g, README.md.
On Fri, Aug 15, 2014 at 02:53:22PM -0700, Tony Kelman wrote: > You're fine, you're just seeing some consequences of the confusing way git > submodules work. For some dependencies that are managed within JuliaLang on > github, they are set up as submodules in the deps folder so it's easier to > work on them while still in version control inside a Julia source tree. > > The next time you do make after a submodule changes, Julia's makefiles > should update the submodules for you. Or you can manually update them with > "git submodule update", should work the same way. Ah: when I did "git submodule update", "git status" showed as clean, i.e., no modified files. So the diffs just reflected that my subprojects were not in sync with the parent. Ross > > git fetch just checks github and updates the remote information about > what's available, doesn't make any changes to your local working copy. Git > pull does a fetch and then merges the latest changes into your working > copy, assuming you don't have any conflicting changes locally. If you > haven't touched anything, usually this is just a "fast-forward" that brings > your copy up to date with what's on github. Unfortunately the submodules > don't auto-update, which is what looks confusing here. > > I personally do a make clean every time I pull, just because Julia's C > codebase is pretty small and quick to rebuild. make clean doesn't touch the > dependencies. You can sometimes get away with not doing make clean, just > doing git pull && make instead, but since building the Julia system image > (the list of .jl files that goes by) is the most time-consuming part of a > build, I prefer avoiding any potential problems and just cleaning all of > the C each time. > > The release-0.3 branch is where the release tags will be made from, but > also future simple bugfixes that don't have to do with any of the breaking > changes currently being made on master will also be backported to > release-0.3. So to keep up to date with those bugfixes before the next > point release of 0.3.1, you should be use the release-0.3 branch, yes. Tags > are supposed to never change, unless Elliot does any more rebases and force > pushes hoping noone notices.
