Integration with Mercurial

1. Introduction

This sample is provided to show DeltaXML Merge integration with mercurial (hg) for merge, graft and update operations.

The sample currently supports the command-line client usage on a unix system.

Please read the comments from the shell-script provided in the sample directory for detailed configuration steps.

2. Usage notes and tips

The DeltaXML Merge results have deltaxml namespaced attributes at the root node which should be removed manually while resolving the conflcits.

DeltaXML Merge can be used with DeltaXML-Merge.args=$base $local $other $output result-type=conflicting-changes word-by-word=true.

The parameter 'result-type' works well with one of the following settings on the commandline:

  • simplified-delta
  • simplified-rule-processed-delta
  • conflicting-changes
  • their-changes
  • all-changes

2.1. simplified-delta and simplified-rule-processed-delta

The simplfied result types show three way merges and are easier to understand.

These results have deltaxml markup and attributes only for the changes. So it is easier to edit and resolve conflicts.

2.2. conflicting-changes, their-changes and all-changes

The result types: conflicting-changes, their-changes and all-changes are three to two merge results. For more details, please visit three to two way merge use cases guide.

These results have deltaxml markup only at the change but deltaxml:deltaV2 attributes are appear throughout the xml hierarchy. Users should remove these attributes manually.

oXygen track instructions can also be applied to these output formats which will then allow the user to accept and reject changes interactively. The result-format command-line option can be used to select this output format.