(Status: resolved. Posting to the list in case it happens to someone else...)
ok, this is getting very wierd now. I've verified it has nothing to do
with my quirky laptop. The leo-editor branch is in a directory I have
synced to my linux computer. I get exactly the same file does not
exist error from a terminal on the linux machine.
So I checked out in a new directory (on the laptop), using 'bzr branch
lp:leo-editor --revisions 3397' flag (thinking it would not retrieve
all the revs from 1 to 3396, wrong!). Now in that branch I have a
whole different set of bzr wierdness going on, console log follows. I
finally managed to fix it by running "bzr revert" 3 times (first two
showed a big long list of files to be added or changed and then exited
with "access denied").
{{{
B:\apps\leo-3397>bzr merge
bzr: ERROR: Working tree "B:/apps/leo-3397/" has uncommitted changes
(See bzr status).
B:\apps\leo-3397>bzr update
Tree is up to date at revision 3452 of branch B:/apps/leo-3397
B:\apps\leo-3397>bzr pull --overwrite
Using saved parent location: http://bazaar.launchpad.net/~leo-editor-team/leo-ed
itor/trunk/
No revisions to pull.
B:\apps\leo-3397>bzr stat
removed:
.bzrignore
LICENSE.txt
Makefile
bzr-manifest.txt
launchLeo.py
# ...goes on to list of *all* leo files...
B:\apps\leo-3397>bzr commit
bzr: ERROR: Conflicts detected in working tree. Use "bzr conflicts"
to list, "bzr resolve FILE" to resolve.
B:\apps\leo-3397>bzr resolve
0 conflict(s) auto-resolved.
Remaining conflicts:
Conflict adding files to leo. Created directory.
Conflict because leo is not versioned, but has versioned children. Versioned di
rectory.
Conflict adding files to leo/Icons. Created directory.
Conflict because leo/Icons is not versioned, but has versioned children. Versio
ned directory.
Conflict adding files to leo/config. Created directory.
Conflict because leo/config is not versioned, but has versioned children. Versi
oned directory.
Contents conflict in leo/config/leoSettings.leo
Conflict adding files to leo/core. Created directory.
Conflict because leo/core is not versioned, but has versioned children. Version
ed directory.
Contents conflict in leo/core/leoApp.py
Contents conflict in leo/core/leoAtFile.py
Contents conflict in leo/core/leoBridge.py
Contents conflict in leo/core/leoChapters.py
Contents conflict in leo/core/leoCommands.py
Contents conflict in leo/core/leoEditCommands.py
Contents conflict in leo/core/leoFileCommands.py
Contents conflict in leo/core/leoFrame.py
Contents conflict in leo/core/leoGlobals.py
Contents conflict in leo/core/leoImport.py
Contents conflict in leo/core/leoKeys.py
Contents conflict in leo/core/leoNodes.py
Contents conflict in leo/core/leoProjects.txt
Contents conflict in leo/core/runLeo.py
Conflict adding files to leo/doc. Created directory.
Conflict because leo/doc is not versioned, but has versioned children. Versione
d directory.
Contents conflict in leo/doc/LeoDocs.leo
Contents conflict in leo/doc/debuggers.txt
Conflict adding files to leo/doc/html. Created directory.
Conflict because leo/doc/html is not versioned, but has versioned children. Ver
sioned directory.
Contents conflict in leo/doc/html/front.html
Contents conflict in leo/doc/leoNotes.txt
Contents conflict in leo/doc/leoToDo.txt
Contents conflict in leo/doc/screen-shots.txt
Contents conflict in leo/doc/unitTesting.txt
Conflict adding files to leo/plugins. Created directory.
Conflict because leo/plugins is not versioned, but has versioned children. Vers
ioned directory.
Contents conflict in leo/plugins/UNL.py
Contents conflict in leo/plugins/baseNativeTree.py
Contents conflict in leo/plugins/leoPluginNotes.txt
Contents conflict in leo/plugins/leo_pdf.py
Contents conflict in leo/plugins/qtGui.py
Contents conflict in leo/plugins/qtframecommands.py
Contents conflict in leo/plugins/rst3.py
Contents conflict in leo/plugins/screenshots.py
Contents conflict in leo/plugins/scrolledmessage.py
Contents conflict in leo/plugins/spellpyx.txt
Contents conflict in leo/plugins/threading_colorizer.py
Contents conflict in leo/plugins/trace_tags.py
Contents conflict in leo/plugins/xsltWithNodes.py
Conflict adding files to leo/test. Created directory.
Conflict because leo/test is not versioned, but has versioned children. Version
ed directory.
Contents conflict in leo/test/test.leo
Contents conflict in leo/test/unitTest.leo
}}}
-matt
--
You received this message because you are subscribed to the Google Groups
"leo-editor" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/leo-editor?hl=en.
