[PATCH STABLE] extdiff: allow modifications in subrepos to be copied back

Matt Mackall mpm at selenic.com
Tue Jul 28 19:01:53 CDT 2015


On Mon, 2015-07-27 at 17:01 -0500, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_harbison at yahoo.com>
> # Date 1438033149 14400
> #      Mon Jul 27 17:39:09 2015 -0400
> # Branch stable
> # Node ID ff6acf895dc1971a6e2aaeea0c1e0d7d8f9c1ee2
> # Parent  511e1949d55708e7eeacc8ab7874df534422e4c6
> extdiff: allow modifications in subrepos to be copied back

Queued for stable, thanks.

> Unfortunately, I don't see a way to create a test that modifies the file in the
> temporary directory before the command exits.

Point extdiff at your own "diff" script?

-- 
Mathematics is the supreme nostalgia of our time.



More information about the Mercurial-devel mailing list