revert: evaluate filesets against working directory (issue4497) As the failing revert tests in test-fileset-generated.t show, Revert currently creates one matcher for matching files in the working copy and another matcher for matching files in the target revision. The two matchers are created with different contexts, which means filesets are evaluated differently. Then the union of the sets of files matching the matchers in the two contexts are reverted. It doesn't seem to make sense to use two different matchers; only the context they're applied to should be different. It seems very likely that the user wants the filesets to be evaluated against the working directory, which the tests test-fileset-generated.t also assume, so let's make it so. I willingly admit that the largefiles code was modified by trial and error (according to tests).

     1

Just exercise debugindexdot

     2

Create a short file history including a merge.

     3

  $ hg init t

     4

  $ cd t

     5

  $ echo a > a

     6

  $ hg ci -qAm t1 -d '0 0'

     7

  $ echo a >> a

     8

  $ hg ci -m t2 -d '1 0'

     9

  $ hg up -qC 0

    10

  $ echo b >> a

    11

  $ hg ci -m t3 -d '2 0'

    12

  created new head

    13

  $ HGMERGE=true hg merge -q

    14

  $ hg ci -m merge -d '3 0'

    15

    16

  $ hg debugindexdot .hg/store/data/a.i

    17

  digraph G {

    18

  	-1 -> 0

    19

  	0 -> 1

    20

  	0 -> 2

    21

  	2 -> 3

    22

  	1 -> 3

    23

  }

    24

    25

  $ cd ..