Subversion Conflicts Not Pretty

[GoogleCodeExporter]

What steps will reproduce the problem?
1. Put a CherryTree XML document under subversion source control.
2. Make multiple working copies with changes in each resulting in a conflict.

What is the expected output? What do you see instead?
Expected - XML is in a pretty print format and resolving conflicts is easy.
Observed - XML is in a single line.  Conflicts are hard to resolve.

What version of the product are you using? On what operating system?
0.32.0 on Kubuntu

Please provide any additional information below.
This is a fantastic program that is very useful for work breakdown.

Original issue reported on code.google.com by rol...@brownslink.net on 20 Oct 2014 at 7:32

[GoogleCodeExporter]

I have modified machines.py to generate pretty XML.  I don't know if this is an 
efficient way to do it but does work and is minimally intrusive.

Original comment by rol...@brownslink.net on 21 Oct 2014 at 2:57

Attachments:

• machines.py

[GoogleCodeExporter]

Thank you, generating pretty XML has the drawback that the resulting XML is 
bigger in size because of additional newlines and indentation.
For this reason I cannot make this the default but I will let the user 
enable/disable the pretty XML in future major release.

Original comment by giuspen@gmail.com on 25 Oct 2014 at 11:34

• Changed state: Accepted

[GoogleCodeExporter]

That is great.  Thank you.

XML is rather bloated and inefficient anyway.  Wanting to use text
utilities like source control may be a compelling reason to put up with
bloat from a user perspective.

Original comment by rol...@brownslink.net on 26 Oct 2014 at 6:24

[GoogleCodeExporter]

Original comment by giuspen@gmail.com on 5 Nov 2014 at 1:06

[manad777]

Anecdotal, but my main file went from 199k characters to 204k after prettyprinting the XML. 2% extra filesize is a pretty negligible difference.

[giuspen]

Implemented in commit f866b6c