D2976: extdiff: document that it copies modified files back to working directory
spectral (Kyle Lippincott)
phabricator at mercurial-scm.org
Fri Mar 30 19:17:09 UTC 2018
spectral created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D2976
AFFECTED FILES
hgext/extdiff.py
tests/test-extension.t
CHANGE DETAILS
diff --git a/tests/test-extension.t b/tests/test-extension.t
--- a/tests/test-extension.t
+++ b/tests/test-extension.t
@@ -730,6 +730,10 @@
called with a configurable set of options and two non-option arguments: paths
to directories containing snapshots of files to compare.
+ If there is more than one file being compared and the "child" revision is the
+ working directory, any modifications made in the external diff program will be
+ copied back to the working directory from the temporary directory.
+
The extdiff extension also allows you to configure new diff commands, so you
do not need to type 'hg extdiff -p kdiff3' always.
diff --git a/hgext/extdiff.py b/hgext/extdiff.py
--- a/hgext/extdiff.py
+++ b/hgext/extdiff.py
@@ -13,6 +13,11 @@
non-option arguments: paths to directories containing snapshots of
files to compare.
+If there is more than one file being compared and the "child" revision
+is the working directory, any modifications made in the external diff
+program will be copied back to the working directory from the temporary
+directory.
+
The extdiff extension also allows you to configure new diff commands, so
you do not need to type :hg:`extdiff -p kdiff3` always. ::
To: spectral, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list