Patchwork D2976: extdiff: document that it copies modified files back to working directory

login
register
mail settings
Submitter phabricator
Date March 31, 2018, 1:22 a.m.
Message ID <c079f87ad39e9f7ac00720dabbfa1243@localhost.localdomain>
Download mbox | patch
Permalink /patch/30030/
State Not Applicable
Headers show

Comments

phabricator - March 31, 2018, 1:22 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG2208149c4b8e: extdiff: document that it copies modified files back to working directory (authored by spectral, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2976?vs=7410&id=7452

REVISION DETAIL
  https://phab.mercurial-scm.org/D2976

AFFECTED FILES
  hgext/extdiff.py
  tests/test-extension.t

CHANGE DETAILS




To: spectral, #hg-reviewers, yuja
Cc: mercurial-devel

Patch

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. ::