Differences between revisions 2 and 4 (spanning 2 versions)

diff-in-diffs extension

This extension adds a new command to create the diff of two diffs.

Contents

diff-in-diffs extension

Status

This extension is not distributed with Mercurial.

Author: André L. F. Pinto

Repository: https://bitbucket.org/andrelfpinto/hg-diff-in-diffs

Overview

More detailed explanation: what it does, how to use it, etc.

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

-  ⇤ ← Revision 2 as of 2016-02-13 19:37:59 → 
  Size: 606
  Editor: AndreLFPinto
  Comment:
+   ← Revision 4 as of 2016-02-13 19:47:23 → ⇥
  Size: 1197
  Editor: AndreLFPinto
  Comment:
-Deletions are marked like this.
+Additions are marked like this.
 Line 1:
-= diff-in-diffs =
+= diff-in-diffs extension =
 Line 11:
-''Author: '' ''(André L. F. Pinto)''
+''Author: '' ''André L. F. Pinto''
 Line 13:
-Repository: ''(https://bitbucket.org/andrelfpinto/hg-diff-in-diffs)''

Web page: ''(where to get more info)''
+Repository: ''https://bitbucket.org/andrelfpinto/hg-diff-in-diffs''
-Line 21:
+Line 19:
+== 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
}}}
-Line 22:
+Line 33:
-Configure your .hgrc to enable the extension by adding following lines:
+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):
-Line 26:
+Line 44:
-...
+diff-in-diffs = <dir>/hg-diff-in-diffs/diff-in-diffs.py

Diff for "DiffInDiffsExtension"