Comment 6 for bug 567250

Revision history for this message
Antti Kaihola (akaihola) wrote :

Yes, now I get past the error, but the file appears corrupted in Leo.

The file I currently have this problem with has 5 sub-nodes. After saving the file, I had closed Leo and reverted Leo's removal of whitespace on blank lines. When re-opening:
- the first node is ok
- the second node contains contents of original nodes 2 & 3
- the third node contains original nodes 4 & 5 plus three extra blank lines and the last two lines of node 2 (or node 3 -- the nodes are almost identical)
- the fourth node is ok (contains original node 4)
- the fifth node is ok (contains original node 5)

I also get a dump of the imported file on the console with this message:

    @shadow did not pick up the external changes correctly

The file ends with a single newline (0x0a) both before and after saving with Leo, so it seems that missing final newlines are not the (only) cause for this symptom. Instead, the addition of whitespace on blank lines seems to cause trouble.

Might the similarity of nodes 2 & 3 confuse Leo in this case? They both contain 17 lines, and only their two initial lines differ (ignoring whitespace on blank lines).

Unfortunately I'm not in a position to force whitespace clean-up on tools used by other members of the team. To ease collaboration and creating clean patches, I'd really like Leo to *not* clean up whitespace, but I haven't found such settings.

I can work around Leo's clean-up by automatically excluding whitespace-only changes from my git commits. But I can't think of an easy way to re-apply them on my working tree after the commit, so fixing this bug would help me a lot. I can try to create further minimal test cases if that helps.

I really like the flexibility Leo gives me and I hope I can contribute to its development!