On 12/31/2013 01:41 PM, David C. Rankin wrote: > On 12/31/2013 12:04 PM, Slávek Banko wrote: >> I assume that your folder 'scripts' is not as a separate git module (current >> state), but as a folder of the 'master' module 'tde' (former state)? Are in >> your .gitmodules information about git module 'scripts'? > > You are 100% correct :) > > I could see git complaining about the scripts file/directory issue, but I could > not figure out what command would fix the conflict. > >> >> First, try on the master tde module: >> git checkout master && git pull --rebase >> >> Once you are in your .gitmodules information about git module 'scripts', >> continue: >> git submodule init -- scripts && git submodule update -- scripts >> >> Then you can try again: >> scripts/switch_all_submodules_to_head_and_clean > > Thank you Slavek! I will give it a go and report back. I'm pulling a fresh > v3.5.13-sru on the box on a different partition right now (I gave up fixing that > one), when it completes I'll try the: > > git checkout master && git pull --rebase > Uugh :( 16:22 providence:~/tde/tde> git checkout master && git pull --rebase M experimental M main/applications/kdmtheme M main/applications/kio-apt M main/applications/kio-locate M main/applications/kio-umountwrapper M main/applications/knetworkmanager9 M main/applications/kpowersave-nohal M main/applications/kradio Already on 'master' Your branch and 'origin/master' have diverged, and have 9509 and 3318 different commits each, respectively. First, rewinding head to replay your work on top of it... warning: unable to rmdir main/applications/kdmtheme: Directory not empty warning: unable to rmdir main/applications/kio-apt: Directory not empty warning: unable to rmdir main/applications/kio-locate: Directory not empty warning: unable to rmdir main/applications/kio-umountwrapper: Directory not empty warning: unable to rmdir main/applications/knetworkmanager9: Directory not empty warning: unable to rmdir main/applications/kpowersave-nohal: Directory not empty warning: unable to rmdir main/applications/kradio: Directory not empty Applying: updates to my r14.000 to bring up to date fatal: sha1 information is lacking or useless (experimental). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 updates to my r14.000 to bring up to date The copy of the patch that failed is found in: /home/david/tde/tde/.git/rebase-apply/patch When you have resolved this problem, run "git rebase --continue". If you prefer to skip this patch, run "git rebase --skip" instead. To check out the original branch and stop rebasing, run "git rebase --abort". 16:24 providence:~/tde/tde> git rebase --skip Unstaged changes after reset: M experimental 16:34 providence:~/tde/tde> git checkout master && git pull --rebase M experimental Already on 'master' Current branch master is up to date. 16:34 providence:~/tde/tde> git status # On branch master # Changes not staged for commit: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: experimental (new commits) # # Untracked files: # (use "git add <file>..." to include in what will be committed) # # main/applications/kdmtheme/ # main/applications/kio-apt/ # main/applications/kio-locate/ # main/applications/kio-umountwrapper/ # main/applications/knetworkmanager9/ # main/applications/kpowersave-nohal/ # main/applications/kradio/ no changes added to commit (use "git add" and/or "git commit -a") 16:36 providence:~/tde/tde> git submodule init -- scripts && git submodule update -- scripts Submodule 'scripts' (http://system@.../scm/git/scripts) registered for path 'scripts' Cloning into 'scripts'... remote: Counting objects: 125, done remote: Finding sources: 100% (125/125) remote: Total 125 (delta 61), reused 125 (delta 61) Receiving objects: 100% (125/125), 20.10 KiB, done. Resolving deltas: 100% (61/61), done. Submodule path 'scripts': checked out 'a48d32b281a28dd71ab81b85888965984ba79cb9' 16:37 providence:~/tde/tde> ./scripts/switch_all_submodules_to_head_and_clean drankin Preparing /home/david/tde/tde for development use HEAD is now at 8b539c0 Reset submodule main/tde-i18n to latest HEAD Removing main/applications/kdmtheme/ Removing main/applications/kio-apt/ Removing main/applications/kio-locate/ Removing main/applications/kio-umountwrapper/ Removing main/applications/knetworkmanager9/ Removing main/applications/kpowersave-nohal/ Removing main/applications/kradio/ Already up-to-date. <snip> Looks to be running normally! Thank you Slavek! Darrell, save this email, it seems to hold the key to fixing screwed up local repos. What it appears to show is that R14 was rebased at some point between my last update and now. Regardless, it looks like I can trust what I have in my repos now. -- David C. Rankin, J.D.,P.E.