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

Test for changeset ba7c74081861

     2

(update dirstate correctly for non-branchmerge updates)

     3

  $ hg init a

     4

  $ cd a

     5

  $ echo a > a

     6

  $ hg add a

     7

  $ hg commit -m a

     8

  $ cd ..

     9

  $ hg clone a b

    10

  updating to branch default

    11

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

    12

  $ cd a

    13

  $ hg mv a b

    14

  $ hg commit -m move

    15

  $ echo b >> b

    16

  $ hg commit -m b

    17

  $ cd ../b

    18

  $ hg pull ../a

    19

  pulling from ../a

    20

  searching for changes

    21

  adding changesets

    22

  adding manifests

    23

  adding file changes

    24

  added 2 changesets with 2 changes to 1 files

    25

  (run 'hg update' to get a working copy)

    26

  $ hg update

    27

  1 files updated, 0 files merged, 1 files removed, 0 files unresolved

    28

    29

  $ cd ..