|
Size: 570
Comment:
|
← Revision 5 as of 2016-02-13 19:53:01 ⇥
Size: 1357
Comment:
|
| Deletions are marked like this. | Additions are marked like this. |
| Line 17: | 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 20: | 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 24: | Line 44: |
| ... | diff-in-diffs = <dir>/hg-diff-in-diffs/diff-in-diffs.py |
| Line 26: | Line 46: |
You also need to configure the EvolveExtension, since its a dependency of this extension. |
|
| Line 29: | Line 51: |
| EvolveExtension |
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.