Hello Edward Am Freitag, 1. November 2013 15:42:26 UTC+1 schrieb Viktor Ransmayr:
> Am Freitag, 1. November 2013 14:15:32 UTC+1 schrieb Edward K. Ream: >> >> On Wed, Oct 30, 2013 at 4:53 PM, Viktor Ransmayr <[email protected]>wrote: >> >> When I tried to update to the latest version of Leo I received the >>> following conflict: >>> [snip] >>> >> >> Text conflict in leo/doc/LeoDocs.leo >> Auf 1 Konflikte gestoßen. >> Now on revision 6202. >> >> Presumably you modified LeoDocs.leo. >> > > NO (and possibly yes ;-) > > As I stated in my initial post I re-created the 'Leo documentations' on my > local computer *** without *** making any modifications myself ... > > >> Several ways to recover: >> >> - bzr revert >> - bzr pull --overwrite. >> >> If those don't work, you may need to pull a new branch >> > > I have created a *new* snapshot from 'bzr branch' - and - will report my > future findings ... > Exactly the same problems occured again ... Pre-Condition: I did *not* modify Leo Docs (beside creating a 'local' version of it ;-) 1) I performed a 'bzr pull' operation to get the latest leo version 2) I tried to open the docs outline from the menue -> Not OK, etc. Here's the log I kept during the activitiy: <log> Update local snapshot of Leo * (Not?) OK. - See 'Log-001' - Snapshot is now on revision 6221 * Restart Leo - OK. - See 'Log-002' * Try to 'Open LeoDocs.leo' - Not OK - See 'Log-003' & 'Log-004' </log> <log-001> C:\Repositories\bzr\leo-editor>bzr pull lp:leo-editor You have not informed bzr of your Launchpad ID, and you must do this to write to Launchpad or access private data. See "bzr help launchpad-login". http://bazaar.launchpad.net/~leo-editor-team/leo-editor/trunk3 is permanently redirected to http://bazaar.launchpad.net/~leo-editor-team/leo-editor/trunk3/changes You have not informed bzr of your Launchpad ID, and you must do this to write to Launchpad or access private data. See "bzr help launchpad-login". +N leo/plugins/nodewatch.py M leo/config/leoSettings.leo M leo/doc/CheatSheet.leo M leo/doc/LeoDocs.leo M leo/doc/leoToDo.txt M leo/plugins/leoPluginsRef.leo Text conflict in leo/doc/LeoDocs.leo Auf 1 Konflikte gestoßen. Now on revision 6221. C:\Repositories\bzr\leo-editor> </log-001> <log-004> C:\Users\Viktor\Worklogs>leo ./WL2013.leo ** isPython3: True Leo 4.11b1, build 6221, 2013-11-02 15:51:23 Python 3.3.2, qt version 4.8.5 Windows 6, 2, 9200, 2, leoID=VR20130923 (in C:\Users\Viktor\.leo) load dir: C:\Repositories\bzr\leo-editor\leo\core global config dir: C:\Repositories\bzr\leo-editor\leo\config home dir: C:\Users\Viktor reading settings in C:\Repositories\bzr\leo-editor\leo\config\leoSettings.leo reading settings in C:\Users\Viktor\.leo\myLeoSettings.leo reading settings in C:\Users\Viktor\Worklogs\WL2013.leo Abbreviations off wrote recent file: C:\Users\Viktor\.leo\.leoRecentFiles.txt reading settings in C:\Repositories\bzr\leo-editor\leo\doc\LeoDocs.leo error parsing C:\Repositories\bzr\leo-editor\leo\doc\LeoDocs.leo Traceback (most recent call last): File "C:\Python33\lib\xml\sax\expatreader.py", line 207, in feed self._parser.Parse(data, isFinal) xml.parsers.expat.ExpatError: not well-formed (invalid token): line 22608, column 1 During handling of the above exception, another exception occurred: Traceback (most recent call last): File "C:\Repositories\bzr\leo-editor\leo\core\leoFileCommands.py", line 1339, in parse_leo_file parser.parse(theFile) # expat does not support parseString File "C:\Python33\lib\xml\sax\expatreader.py", line 107, in parse xmlreader.IncrementalParser.parse(self, source) File "C:\Python33\lib\xml\sax\xmlreader.py", line 123, in parse self.feed(buffer) File "C:\Python33\lib\xml\sax\expatreader.py", line 211, in feed self._err_handler.fatalError(exc) File "C:\Python33\lib\xml\sax\handler.py", line 38, in fatalError raise exception xml.sax._exceptions.SAXParseException: <unknown>:22608:1: not well-formed (invalid token) Abbreviations off error parsing C:\Repositories\bzr\leo-editor\leo\doc\LeoDocs.leo Traceback (most recent call last): File "C:\Python33\lib\xml\sax\expatreader.py", line 207, in feed self._parser.Parse(data, isFinal) xml.parsers.expat.ExpatError: not well-formed (invalid token): line 22608, column 1 During handling of the above exception, another exception occurred: Traceback (most recent call last): File "C:\Repositories\bzr\leo-editor\leo\core\leoFileCommands.py", line 1339, in parse_leo_file parser.parse(theFile) # expat does not support parseString File "C:\Python33\lib\xml\sax\expatreader.py", line 107, in parse xmlreader.IncrementalParser.parse(self, source) File "C:\Python33\lib\xml\sax\xmlreader.py", line 123, in parse self.feed(buffer) File "C:\Python33\lib\xml\sax\expatreader.py", line 211, in feed self._err_handler.fatalError(exc) File "C:\Python33\lib\xml\sax\handler.py", line 38, in fatalError raise exception xml.sax._exceptions.SAXParseException: <unknown>:22608:1: not well-formed (invalid token) </log-004> With kind regards, Viktor -- You received this message because you are subscribed to the Google Groups "leo-editor" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. Visit this group at http://groups.google.com/group/leo-editor. For more options, visit https://groups.google.com/groups/opt_out.
