diff-in-diffs extension
This extension adds a new command to create the diff of two diffs.
Status
This extension is not distributed with Mercurial.
Author: André L. F. Pinto
Repository: https://bitbucket.org/andrelfpinto/hg-diff-in-diffs
Overview
This extension creates the diff of two diffs by applying them in the repository and them computing the diff.
Usage
hg diff-in-diffs [OPTION]... DIFF1 DIFF2
Options
-f --apply-first compute diff in diffs and apply DIFF1 -a --apply-all compute diff in diffs and apply DIFF1 and DIFF2
Configuration
First you have to download the extension code. Pick a directory <dir> in your working environment, cd into that and clone diff-in-diffs. Like this:
$ cd <dir> $ hg clone https://bitbucket.org/andrelfpinto/hg-diff-in-diffs/
Then configure your .hgrc to enable the extension by adding the following lines (remember to replace <dir> with the path where you just cloned the extension):
[extensions] diff-in-diffs = <dir>/hg-diff-in-diffs/diff-in-diffs.py
You also need to configure the EvolveExtension, since its a dependency of this extension.