DiffApply

DiffApply[diffobj,expr]

returns the result of applying the given DiffObject to the expression expr.

DiffApply[diffobj,expr,File["file"]]

writes the result of changing expr to file.

Details and Options

lists	{…}	returns differences between two lists
text	"text", File["fname.txt"]	returns differences in individual characters, words or lines between two blocks of text
biomolecular sequences	BioSequence[…]	returns differences in letter strings between two biomolecular sequences
cells	Cell[…], CellObject[…]	returns differences in content, styles and options between two cells
notebooks	Notebook[…], NotebookObject[…], File["fname.nb"]	returns differences in cells and options between two notebooks

diffobj must be a DiffObject that was generated from the same type of expression as expr.
DiffApply[Diff[old,new],old] returns new, assuming that old and new are supported for diffing.
If a DiffObject was generated by Diff3, DiffApply will merge all changes into a single result, as long as there are no conflicts.
When writing the output to a file, existing files are not overwritten by default. Use DiffApply[…,OverwriteTargetTrue] to force an existing file to be overwritten.
If DiffApply returns a Failure object, the following tags are used:

	"InvalidDiffObject"	diffobj is not a valid DiffObject
	"DiffObjectContainsConflicts"	diffobj contains conflict markers
	"WrongType"	the expression type of diffobj is different from expr
	"DiffApplyFailure"	diffobj contains changes that do not map onto expr
	"CantOverwriteFile"	"file" exists and the OverwriteTarget setting does not allow it to be overwritten

open allclose all

Apply diffs to a list:

Apply diffs to a string:

Apply two different changes to a common ancestor:

Apply changes one word at a time:

Applying a DiffObject that includes conflicts will return a Failure object:

A DiffObject can only be applied to the same kind of expression that generated it:

Top