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.
Makefile
author Patrick Mezard <patrick@mezard.eu>
Wed, 13 Jun 2012 18:28:10 +0200
changeset 269 6c6bb7a23bb5
parent 0 bbeef801409c
child 531 b18b00036355
permissions -rw-r--r--
stabilize: improve unstable selection heuristic Without argument, stabilize was picking the first in: "unstable() and ((suspended() or obsancestors(::.))::)" which usually returned the "oldest" unstable revision in parent predecessors descendants. This revision is interesting because it usually gives "soft" merges but rebasing it left the working directory on a remote branch, which was very confusing. The new heuristic picks an unstable changeset which can be rebased on top of the parent revision, or on top of one of its descendants (selected in revision order). This has the advantage of selecting a revision which can be rebased on the current subtree, and leave the working directory in a more convenient location.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
0
bbeef801409c minimalistic state concept.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset 
     1
 
PYTHON=python
bbeef801409c minimalistic state concept.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset 
     2
 
HG=`which hg`
bbeef801409c minimalistic state concept.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset 
     3
 












bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




     4


help:












bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




     5


	@echo 'Commonly used make targets:'












bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




     6


	@echo '  tests              - run all tests in the automatic test suite'












bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




     7


	@echo '  all-version-tests - run all tests against many hg versions'












bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




     8


	@echo '  tests-%s           - run all tests in the specified hg version'












bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




     9














bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    10


all: help












bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    11














bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    12


tests:












bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    13


	cd tests && $(PYTHON) run-tests.py --with-hg=$(HG) $(TESTFLAGS)












bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    14














bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    15


test-%:












bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    16


	cd tests && $(PYTHON) run-tests.py --with-hg=$(HG) $(TESTFLAGS) $@












bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    17














bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    18


tests-%:












bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    19


	@echo "Path to crew repo is $(CREW) - set this with CREW= if needed."












bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    20


	hg -R $(CREW) checkout $$(echo $@ | sed s/tests-//) && \












bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    21


	(cd $(CREW) ; $(MAKE) clean ) && \












bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    22


	cd tests && $(PYTHON) $(CREW)/tests/run-tests.py $(TESTFLAGS)












bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    23














bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    24


all-version-tests: tests-1.3.1 tests-1.4.3 tests-1.5.4 \












bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    25


                   tests-1.6.4 tests-1.7.5 tests-1.8 tests-tip












bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    26














bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    27


.PHONY: tests all-version-tests














evolve