Differences between revisions 2 and 5 (spanning 3 versions)
⇤ ← Revision 2 as of 2016-02-13 19:37:59 →
Size: 606
Editor: AndreLFPinto
Comment:
← Revision 5 as of 2016-02-13 19:53:01 → ⇥
Size: 1357
Editor: AndreLFPinto
Comment:
Deletions are marked like this. Additions are marked like this.
Line 1: Line 1:
= diff-in-diffs = = diff-in-diffs extension =
Line 11: Line 11:
''Author: '' ''(André L. F. Pinto)'' ''Author: '' ''André L. F. Pinto''
Line 13: 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 19: Line 17:
More detailed explanation: what it does, how to use it, etc. 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
}}}
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
Line 28: Line 46:

You also need to configure the EvolveExtension, since its a dependency of this extension.
Line 31: Line 51:
EvolveExtension

diff-in-diffs extension

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

Contents

  1. diff-in-diffs extension
    1. Status
    2. Overview
    3. Usage
      1. Options
    4. Configuration
    5. See also

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.

See also

EvolveExtension

CategoryExtensionsByOthers

DiffInDiffsExtension (last edited 2016-02-13 19:53:01 by AndreLFPinto)