tests/test-mq-qsave.t
author Martin von Zweigbergk <martinvonz@google.com>
Mon, 23 Mar 2015 23:04:51 -0700
changeset 24438 5b85a5bc5bbb
parent 12324 b701610f6c56
child 49621 55c6ebd11cb9
permissions -rw-r--r--
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).
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12324
b701610f6c56 tests: unify some of test-mq*
Adrian Buehlmann <adrian@cadifra.com>
parents: 2990
diff changeset
     1
  $ echo "[extensions]" >> $HGRCPATH
b701610f6c56 tests: unify some of test-mq*
Adrian Buehlmann <adrian@cadifra.com>
parents: 2990
diff changeset
     2
  $ echo "mq=" >> $HGRCPATH
2817
ff3edd1c1e27 Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
     3
12324
b701610f6c56 tests: unify some of test-mq*
Adrian Buehlmann <adrian@cadifra.com>
parents: 2990
diff changeset
     4
  $ hg init
2817
ff3edd1c1e27 Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
     5
12324
b701610f6c56 tests: unify some of test-mq*
Adrian Buehlmann <adrian@cadifra.com>
parents: 2990
diff changeset
     6
  $ echo 'base' > base
b701610f6c56 tests: unify some of test-mq*
Adrian Buehlmann <adrian@cadifra.com>
parents: 2990
diff changeset
     7
  $ hg ci -Ambase
b701610f6c56 tests: unify some of test-mq*
Adrian Buehlmann <adrian@cadifra.com>
parents: 2990
diff changeset
     8
  adding base
2817
ff3edd1c1e27 Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
     9
12324
b701610f6c56 tests: unify some of test-mq*
Adrian Buehlmann <adrian@cadifra.com>
parents: 2990
diff changeset
    10
  $ hg qnew -mmqbase mqbase
2817
ff3edd1c1e27 Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    11
12324
b701610f6c56 tests: unify some of test-mq*
Adrian Buehlmann <adrian@cadifra.com>
parents: 2990
diff changeset
    12
  $ hg qsave
b701610f6c56 tests: unify some of test-mq*
Adrian Buehlmann <adrian@cadifra.com>
parents: 2990
diff changeset
    13
  $ hg qrestore 2
b701610f6c56 tests: unify some of test-mq*
Adrian Buehlmann <adrian@cadifra.com>
parents: 2990
diff changeset
    14
  restoring status: hg patches saved state
b701610f6c56 tests: unify some of test-mq*
Adrian Buehlmann <adrian@cadifra.com>
parents: 2990
diff changeset
    15