Re: [Libreoffice-qa] Git error with bibisect40
Hello Ken, all, On Wed, Dec 11, 2013 at 12:09 PM, Ken Biondi kenbio...@hotmail.com wrote: Unfortunately neither git checkout . nor git clean -fd, git reset --hard solved my problem. I wonder what is your output of git status. Anyway, I would try delete everything except one .git/ hidden folder, and do git checkout oldest. Note: I didn't try bibisect40 yet, so this may not work. :-) Best Regards, -- Korrawit Pruegsanusak ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Git error with bibisect40
On Wed, 2013-12-11 at 23:14 +0700, Korrawit Pruegsanusak wrote: Hello Ken, all, On Wed, Dec 11, 2013 at 12:09 PM, Ken Biondi kenbio...@hotmail.com wrote: Unfortunately neither git checkout . nor git clean -fd, git reset --hard solved my problem. I wonder what is your output of git status. Anyway, I would try delete everything except one .git/ hidden folder, and do git checkout oldest. I have added Ken's pair of commands from his earlier email and his recommendation from below to the wiki, with no more explanation than if one does not solve the problem, try the next. The change: https://wiki.documentfoundation.org/index.php?title=QA% 2FHowToBibisectaction=historysubmitdiff=81218oldid=81064; the result: https://wiki.documentfoundation.org/QA/HowToBibisect#Installed_LibreOffice_became_modified_unexpectedly. Note: I didn't try bibisect40 yet, so this may not work. :-) Several times along the way, I have resorted to the extreme measure of deleting the directory with the bibisect repository and extracting it again from the tarfile. That is perhaps the ultimate repair. Terry. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Git error with bibisect40
On Wed, Dec 11, 2013 at 3:00 PM, Terrence Enger ten...@iseries-guru.com wrote: On Wed, 2013-12-11 at 23:14 +0700, Korrawit Pruegsanusak wrote: Hello Ken, all, On Wed, Dec 11, 2013 at 12:09 PM, Ken Biondi kenbio...@hotmail.com wrote: Unfortunately neither git checkout . nor git clean -fd, git reset --hard solved my problem. I wonder what is your output of git status. Anyway, I would try delete everything except one .git/ hidden folder, and do git checkout oldest. I have added Ken's pair of commands from his earlier email and his recommendation from below to the wiki, with no more explanation than if one does not solve the problem, try the next. The change: https://wiki.documentfoundation.org/index.php?title=QA% 2FHowToBibisectaction=historysubmitdiff=81218oldid=81064; the result: https://wiki.documentfoundation.org/QA/HowToBibisect#Installed_LibreOffice_became_modified_unexpectedly. Note: I didn't try bibisect40 yet, so this may not work. :-) Several times along the way, I have resorted to the extreme measure of deleting the directory with the bibisect repository and extracting it again from the tarfile. That is perhaps the ultimate repair. provide that you do have a .git directory in there then rm -fr * (will delete everything but .git /.gitignore and othe .* files) then git checkout newest (assuming that the repo has a 'newest' tag) should bring you back in a 'sane state' then again maybe you are in the middle of a bisection.. then git bisect --reset may help it is a bit hard to fix thing 'blind'.. but assuredly it is fixable... it is just a matter of understanding in what state your tree is Norbert ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Git error with bibisect40
On Wed, Dec 11, 2013 at 4:00 PM, Terrence Enger ten...@iseries-guru.com wrote: Several times along the way, I have resorted to the extreme measure of deleting the directory with the bibisect repository and extracting it again from the tarfile. That is perhaps the ultimate repair. Yes, that is the most drastic approach :-) In most cases we hopefully can avoid needing to take that step! Many of the bibisect woes that we've encountered in the past have been tracked back to interactions with other running instances of soffice (often touching the same user profile). Things I would try include - Shutting down all versions of Libre/Open Office - Checking again (ps aux|grep office) - Restarting the computer To avoid these types of interactions in the future, I suggest using a wrapper script (not checked-in, but located in the same directory as the bibisect repo). Here's one I cooked up based on Miroslaw's suggestions (I'm in the process of getting it added to the buildbot repo): http://testing.eagleeyet.net/~qubit/bibisect/run-libreoffice.sh Cheers, --R ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Git error with bibisect40
On Sat, 2013-12-07 at 05:33 -0600, Norbert Thiebaud wrote: On Fri, Dec 6, 2013 at 9:16 PM, Ken Biondi kenbio...@hotmail.com wrote: Hello all, While attempting bibisect I got the following error: ken@ubuntu:/media/LACIE/LO-Bibisect/Bibi4/bibisect40$ git checkout oldest error: Your local changes to the following files would be overwritten by checkout: opt/CREDITS.odt opt/LICENSE.odt . . . opt/program/libodbclo.so opt/pr Aborting Any ideas on how to fix this? I tried git reset --hard to no avail. git clean -fd git reset --hard should do the trick For this situation, the wiki page How to Bibisect https://wiki.documentfoundation.org/QA/HowToBibisect#Installed_LibreOffice_became_modified_unexpectedly prescribes: git checkout . From my limited understanding of git, I think either solution would do the job. Should I add Norbert's pair of commands to the wiki in addition to or instead of what is there? Thanks, Terry. Norbert ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Git error with bibisect40
On Fri, Dec 6, 2013 at 9:16 PM, Ken Biondi kenbio...@hotmail.com wrote: Hello all, While attempting bibisect I got the following error: ken@ubuntu:/media/LACIE/LO-Bibisect/Bibi4/bibisect40$ git checkout oldest error: Your local changes to the following files would be overwritten by checkout: opt/CREDITS.odt opt/LICENSE.odt . . . opt/program/libodbclo.so opt/pr Aborting Any ideas on how to fix this? I tried git reset --hard to no avail. git clean -fd git reset --hard should do the trick Norbert ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] Git error with bibisect40
Hello all, While attempting bibisect I got the following error: ken@ubuntu:/media/LACIE/LO-Bibisect/Bibi4/bibisect40$ git checkout oldest error: Your local changes to the following files would be overwritten by checkout: opt/CREDITS.odt opt/LICENSE.odt . . . opt/program/libodbclo.so opt/pr Aborting Any ideas on how to fix this? I tried git reset --hard to no avail. Thanks for any help, Ken Biondi kenbio...@hotmail.com ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
