Thanks, Tom. It works.
After checking out maint, I can checkout master then, git submodule init volk and now all 3 branches (next, master, maint) checkout correctly. My issue was being unfamiliar with git submodules. I'll wait for 3.7.7 before further testing - so many new cool features to play with! -- Tom, N5EG On Sun, Apr 5, 2015 at 10:06 AM, Tom Rondeau <t...@trondeau.com> wrote: > On Sun, Apr 5, 2015 at 11:51 AM, Tom McDermott <tom.n...@gmail.com> wrote: > >> When I clone from the gnuradio repository: >> >> *git clone* --recursive http://git.*gnuradio*.org/git/*gnuradio*.git >> >> The clone succeeds. It is on the master branch. I can checkout next, and >> switch back and forth >> between next and master. However when I attempt to checkout maint, git >> says the checkout is aborted >> because the untracked working tree (everything in volk) would be >> overwritten by the maint checkout. >> >> $ git checkout maint >> error: The following untracked working tree files would be overwritten by >> checkout: >> volk/CMakeLists.txt >> volk/apps/CMakeLists.txt >> .... many line of volk/ contents ... >> >> Aborting >> >> Any advice on how to get to the maint version? >> >> -- Tom, N5EG >> > > You'll need to deinitialize the volk submodule first to make it a clean > checkout: > > git submodule deinit volk > git checkout maint > > Probably best not to worry too much about this. For feature branches, > you'll do this and then rebase off master to prevent this happening again. > For maint, if you need it, best to keep a separate directory just for that > branch. > > This is temporary. The planned release of 3.7.7 is next Monday. When that > happens, master becomes maint, so the current maint issue will go away. > > Tom > > > > >> On Sat, Apr 4, 2015 at 9:28 AM, madengr <rfeng...@me.com> wrote: >> >>> Actually now I see it would probably be: >>> >>> git pull --recurse-submodules=on >>> git submodule update >>> >>> >>> >>> >>> -- >>> View this message in context: >>> http://gnuradio.4.n7.nabble.com/Empty-volk-directory-when-I-git-gnuradio-tp53073p53155.html >>> Sent from the GnuRadio mailing list archive at Nabble.com. >>> >>> _______________________________________________ >>> Discuss-gnuradio mailing list >>> Discuss-gnuradio@gnu.org >>> https://lists.gnu.org/mailman/listinfo/discuss-gnuradio >>> >> >> >> _______________________________________________ >> Discuss-gnuradio mailing list >> Discuss-gnuradio@gnu.org >> https://lists.gnu.org/mailman/listinfo/discuss-gnuradio >> >> >
_______________________________________________ Discuss-gnuradio mailing list Discuss-gnuradio@gnu.org https://lists.gnu.org/mailman/listinfo/discuss-gnuradio
