1536759 - cross-channel merge logic for Android needs to merge xml namespaces

Status: RESOLVED FIXED

(Localization Infrastructure and Tools :: compare-locales, defect, P1)

Description

[Axel Hecht [:Pike]]

Right now, if one of the merged Android documents in cross-channel merge uses namespaced attributes, the document header doesn't have the namespace definitions.

We'll need to fix that for the Amazon browsers.

Comment 1

[Axel Hecht [:Pike]]

Attachment: Bug 1536759, merge namespaces in android xml files, r=flod

When two documents in cross-channel merge have different
namespace definitions, merge the properly.
This is done by creating explicit parser nodes, and splitting
the xml headmatter into everything up to resources, then
possibly attributes, then >. We always need an explicit
token for > so that we can insert namespaces from one document
if there are none in the other.

Comment 2

[Axel Hecht [:Pike]]

https://hg.mozilla.org/l10n/compare-locales/rev/c9686c7e258650f74b07cbeb9373285369dd57bb, marking FIXED.