[PATCH] dirstate: drop explicitly-specified files that shouldn't match (BC)

Augie Fackler raf at durin42.com
Tue Feb 13 13:19:49 EST 2018



> On Feb 10, 2018, at 23:09, Yuya Nishihara <yuya at tcha.org> wrote:
> 
> # HG changeset patch
> # User Yuya Nishihara <yuya at tcha.org>
> # Date 1516963719 -32400
> #      Fri Jan 26 19:48:39 2018 +0900
> # Node ID ba8846546795996af10fe93db4317b855018d749
> # Parent  91aac8e6604d1aa08b2683c1d4c7d1936f226e48
> dirstate: drop explicitly-specified files that shouldn't match (BC)

New tests have appeared since you wrote this, and appear to cause surprise breakage. I don't have time to look now, but for now I'm going to discard this patch (but I agree we should come back to it.)

cd tests && python run-tests.py -j7 test-narrow-commit.t

--- /Users/augie/Programming/hg/crew/tests/test-narrow-commit.t
+++ /Users/augie/Programming/hg/crew/tests/test-narrow-commit.t.flat.err
@@ -49,12 +49,8 @@
   matcher: <includematcher includes='(?:(?:|.*/)f1(?:/|$))'>
   f  inside/f1  inside/f1
   $ hg add outside/f1
-  abort: cannot track 'outside/f1' - it is outside the narrow clone
-  [255]
   $ touch outside/f3
   $ hg add outside/f3
-  abort: cannot track 'outside/f3' - it is outside the narrow clone
-  [255]
   $ rm -r outside

 Can modify dirstate inside

ERROR: test-narrow-commit.t (case flat) output changed
!
--- /Users/augie/Programming/hg/crew/tests/test-narrow-commit.t
+++ /Users/augie/Programming/hg/crew/tests/test-narrow-commit.t.tree.err
@@ -49,12 +49,8 @@
   matcher: <includematcher includes='(?:(?:|.*/)f1(?:/|$))'>
   f  inside/f1  inside/f1
   $ hg add outside/f1
-  abort: cannot track 'outside/f1' - it is outside the narrow clone
-  [255]
   $ touch outside/f3
   $ hg add outside/f3
-  abort: cannot track 'outside/f3' - it is outside the narrow clone
-  [255]
   $ rm -r outside

 Can modify dirstate inside

ERROR: test-narrow-commit.t (case tree) output changed
!
Failed test-narrow-commit.t (case flat): output changed
Failed test-narrow-commit.t (case tree): output changed



More information about the Mercurial-devel mailing list