Mercurial Mercurial > pub > hg > evolve / 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-check-commit.t
author Pulkit Goyal <7895pulkit@gmail.com>
Thu, 14 Jun 2018 01:39:11 +0530
changeset 3849 a17d4934c5ce
parent 2672 a08bd434a19b
permissions -rw-r--r--
tests: fix a test case to not create conflicts This is the test case where we are testing about divergence resolution of stack of patches. If the stack is as follows: C1 C2 | | B1 B2 | | A1 A2 \/ base And A1-A2, B1-B2 and C1-C2 are content-divergent, and merging A1-A2 results in conflicts. Now if you resolve conflicts and continue resoling B1-B2, the conflicts of A1-A2 will still be there. We need somehow to understand the work we has done and not create conflicts again. To test the evolution functionality for now, we make sure conflicts does not occur.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2335
f7ce3b9167d6 tests: add the commit style checker from Mercurial
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset 
     1
 
#require test-repo
f7ce3b9167d6 tests: add the commit style checker from Mercurial
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset 
     2
 












f7ce3b9167d6
tests: add the commit style checker from Mercurial



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 

diff
changeset




     3


Enable obsolescence to avoid the warning issue when obsmarker are found












f7ce3b9167d6
tests: add the commit style checker from Mercurial



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 

diff
changeset




     4














f7ce3b9167d6
tests: add the commit style checker from Mercurial



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 

diff
changeset




     5


  $ cat << EOF >> $HGRCPATH







2672






a08bd434a19b
test: avoid 'test-check-commit.t' complaining copied code



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
2335

diff
changeset




     6


  > [diff]












a08bd434a19b
test: avoid 'test-check-commit.t' complaining copied code



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
2335

diff
changeset




     7


  > git = yes







2335






f7ce3b9167d6
tests: add the commit style checker from Mercurial



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 

diff
changeset




     8


  > [experimental]












f7ce3b9167d6
tests: add the commit style checker from Mercurial



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 

diff
changeset




     9


  > evolution=all












f7ce3b9167d6
tests: add the commit style checker from Mercurial



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 

diff
changeset




    10


  > EOF












f7ce3b9167d6
tests: add the commit style checker from Mercurial



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 

diff
changeset




    11














f7ce3b9167d6
tests: add the commit style checker from Mercurial



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 

diff
changeset




    12


Go back in the hg repo












f7ce3b9167d6
tests: add the commit style checker from Mercurial



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 

diff
changeset




    13














f7ce3b9167d6
tests: add the commit style checker from Mercurial



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 

diff
changeset




    14


  $ cd $TESTDIR/..












f7ce3b9167d6
tests: add the commit style checker from Mercurial



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 

diff
changeset




    15














f7ce3b9167d6
tests: add the commit style checker from Mercurial



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 

diff
changeset




    16


  $ for node in `hg log --rev 'not public() and ::. and not desc("# no-check-commit")' --template '{node|short}\n'`; do












f7ce3b9167d6
tests: add the commit style checker from Mercurial



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 

diff
changeset




    17


  >    hg export $node | ${RUNTESTDIR}/../contrib/check-commit > ${TESTTMP}/check-commit.out












f7ce3b9167d6
tests: add the commit style checker from Mercurial



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 

diff
changeset




    18


  >    if [ $? -ne 0 ]; then












f7ce3b9167d6
tests: add the commit style checker from Mercurial



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 

diff
changeset




    19


  >        echo "Revision $node does not comply with rules"












f7ce3b9167d6
tests: add the commit style checker from Mercurial



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 

diff
changeset




    20


  >        echo '------------------------------------------------------'












f7ce3b9167d6
tests: add the commit style checker from Mercurial



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 

diff
changeset




    21


  >        cat ${TESTTMP}/check-commit.out












f7ce3b9167d6
tests: add the commit style checker from Mercurial



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 

diff
changeset




    22


  >        echo












f7ce3b9167d6
tests: add the commit style checker from Mercurial



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 

diff
changeset




    23


  >   fi












f7ce3b9167d6
tests: add the commit style checker from Mercurial



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 

diff
changeset




    24


  > done














evolve