Intelligent docbook merging?

Nicholas Allen nick at bitwig.com
Thu Feb 24 12:15:40 UTC 2011


Hi,

We're thinking of using Bazaar to manage the authoring of a docbook
document. Some of our developers like to work with the XML text files
directly in a text editor and others prefer more WYSIWYG editors that
change the formatting of the document when they save (eg inserting white
space).

Bazaar just tries to resolve conflicts using the raw text but I was
wondering if there's a way to make Bazaar more intelligent for this use
case and understand the semantics of the XML docbook document. The white
space is not really important and theoretically a much better merge
could be achieved using the semantics of the XML document.

Does anyone know if this is possible? Is there a plugin that can do this?

Nick



More information about the bazaar mailing list