Hello Edward, When I tried to update to the latest version of Leo I received the following conflict:
<log> 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". M leo/config/leoSettings.leo M leo/core/leoApp.py M leo/core/leoAtFile.py M leo/core/leoCommands.py M leo/core/leoEditCommands.py M leo/core/leoShadow.py M leo/doc/CheatSheet.leo M leo/doc/LeoDocs.leo M leo/doc/html/index.html M leo/doc/leoNotes.txt M leo/doc/leoProjects.txt M leo/doc/leoToDo.txt M leo/doc/release_notes.txt M leo/plugins/screenshots.py M leo/scripts/leoScripts.txt M leo/scripts/scripts.leo M leo/test/activeUnitTests.txt M pylint-leo.py Text conflict in leo/doc/LeoDocs.leo Auf 1 Konflikte gestoßen. Now on revision 6202. C:\Repositories\bzr\leo-editor> </log> The day before I had created the Leo snapshot from scratch via 'bzr branch' - and - I had successfully created the Leo documentation locally ... When I try to do the same now I receive the following traceback: <tb> C:\Users\Viktor\Worklogs>leo ./WL2013.leo ** isPython3: True Leo 4.11a3, build 6202, 2013-10-30 22:37:12 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 1101, 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>:1101: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 1101, 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>:1101:1: not well-formed (invalid token) </tb> 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.
