Mercurial Mercurial > mercurial / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-dirstate-nonnormalset.t
author Anton Shestakov <av6@dwimlabs.net>
Fri, 20 Sep 2019 23:31:03 +0700
branchstable
changeset 42958 181e52f2b62f
parent 27591 127cc7f78475
child 45765 ed84a4d48910
permissions -rw-r--r--
merge: back out changeset a4ca0610c754 (parents order when grafting a merge) Turns out it's not enough to just swap parents, because when we do, there are unexpected bad side effects, such as a tracked file becoming untracked. These side effects need more code to be handled properly, but it's not written yet. Let's back this feature out from stable for now and some day implement it on default instead.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
27591
127cc7f78475 dirstate: add test for non-normal set consistency
Laurent Charignon <lcharignon@fb.com>
parents:
diff changeset 
     1
 
  $ cat >> $HGRCPATH << EOF
127cc7f78475 dirstate: add test for non-normal set consistency
Laurent Charignon <lcharignon@fb.com>
parents:
diff changeset 
     2
 
  > [ui]
127cc7f78475 dirstate: add test for non-normal set consistency
Laurent Charignon <lcharignon@fb.com>
parents:
diff changeset 
     3
 
  > logtemplate="{rev}:{node|short} ({phase}) [{tags} {bookmarks}] {desc|firstline}\n"
127cc7f78475 dirstate: add test for non-normal set consistency
Laurent Charignon <lcharignon@fb.com>
parents:
diff changeset 
     4
 
  > [extensions]
127cc7f78475 dirstate: add test for non-normal set consistency
Laurent Charignon <lcharignon@fb.com>
parents:
diff changeset 
     5
 
  > dirstateparanoidcheck = $TESTDIR/../contrib/dirstatenonnormalcheck.py
127cc7f78475 dirstate: add test for non-normal set consistency
Laurent Charignon <lcharignon@fb.com>
parents:
diff changeset 
     6
 
  > [experimental]
127cc7f78475 dirstate: add test for non-normal set consistency
Laurent Charignon <lcharignon@fb.com>
parents:
diff changeset 
     7
 
  > nonnormalparanoidcheck = True
127cc7f78475 dirstate: add test for non-normal set consistency
Laurent Charignon <lcharignon@fb.com>
parents:
diff changeset 
     8
 
  > [devel]
127cc7f78475 dirstate: add test for non-normal set consistency
Laurent Charignon <lcharignon@fb.com>
parents:
diff changeset 
     9
 
  > all-warnings=True
127cc7f78475 dirstate: add test for non-normal set consistency
Laurent Charignon <lcharignon@fb.com>
parents:
diff changeset 
    10
 
  > EOF
127cc7f78475 dirstate: add test for non-normal set consistency
Laurent Charignon <lcharignon@fb.com>
parents:
diff changeset 
    11
 
  $ mkcommit() {
127cc7f78475 dirstate: add test for non-normal set consistency
Laurent Charignon <lcharignon@fb.com>
parents:
diff changeset 
    12
 
  >    echo "$1" > "$1"
127cc7f78475 dirstate: add test for non-normal set consistency
Laurent Charignon <lcharignon@fb.com>
parents:
diff changeset 
    13
 
  >    hg add "$1"
127cc7f78475 dirstate: add test for non-normal set consistency
Laurent Charignon <lcharignon@fb.com>
parents:
diff changeset 
    14
 
  >    hg ci -m "add $1"
127cc7f78475 dirstate: add test for non-normal set consistency
Laurent Charignon <lcharignon@fb.com>
parents:
diff changeset 
    15
 
  > }
127cc7f78475 dirstate: add test for non-normal set consistency
Laurent Charignon <lcharignon@fb.com>
parents:
diff changeset 
    16
 












127cc7f78475
dirstate: add test for non-normal set consistency



Laurent Charignon <lcharignon@fb.com>


parents: 

diff
changeset




    17


  $ hg init testrepo












127cc7f78475
dirstate: add test for non-normal set consistency



Laurent Charignon <lcharignon@fb.com>


parents: 

diff
changeset




    18


  $ cd testrepo












127cc7f78475
dirstate: add test for non-normal set consistency



Laurent Charignon <lcharignon@fb.com>


parents: 

diff
changeset




    19


  $ mkcommit a












127cc7f78475
dirstate: add test for non-normal set consistency



Laurent Charignon <lcharignon@fb.com>


parents: 

diff
changeset




    20


  $ mkcommit b












127cc7f78475
dirstate: add test for non-normal set consistency



Laurent Charignon <lcharignon@fb.com>


parents: 

diff
changeset




    21


  $ mkcommit c












127cc7f78475
dirstate: add test for non-normal set consistency



Laurent Charignon <lcharignon@fb.com>


parents: 

diff
changeset




    22


  $ hg status














mercurial