Mercurial > evolve
annotate Makefile @ 1540:5a1cfb1160a6
inhibit: update test with new behavior from core
The recent changes in core (to make sure that all bookmarks write are done at
the end of a transaction) changed the behavior of inhibit. When one rebases
a set of hidden revs somewhere, the hidden revs become visible at the end of
the rebase. Both the previous behavior and new behavior seems acceptable but
the tests have to be changed subsequently. This patch modifies one of the test
for inhibit when the case mentioned above happens. We prune the revs inhibited
by the rebase to make the change minimal.
author | Laurent Charignon <lcharignon@fb.com> |
---|---|
date | Tue, 01 Dec 2015 10:25:38 -0800 |
parents | bfbd99b50f8f |
children | 38d1463f3e0f |
rev | line source |
---|---|
542
ca5bb72d14ae
pkg: abstract version in makefile
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
531
diff
changeset
|
1 VERSION=$(shell python setup.py --version) |
ca5bb72d14ae
pkg: abstract version in makefile
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
531
diff
changeset
|
2 |
0
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 |
531
b18b00036355
pkg/debian: Debian packaging
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
0
diff
changeset
|
12 deb-prepare: |
b18b00036355
pkg/debian: Debian packaging
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
0
diff
changeset
|
13 python setup.py sdist --dist-dir .. |
542
ca5bb72d14ae
pkg: abstract version in makefile
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
531
diff
changeset
|
14 mv -f ../hg-evolve-$(VERSION).tar.gz ../mercurial-evolve_$(VERSION).orig.tar.gz |
ca5bb72d14ae
pkg: abstract version in makefile
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
531
diff
changeset
|
15 tar xf ../mercurial-evolve_$(VERSION).orig.tar.gz |
ca5bb72d14ae
pkg: abstract version in makefile
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
531
diff
changeset
|
16 rm -rf ../mercurial-evolve_$(VERSION).orig |
ca5bb72d14ae
pkg: abstract version in makefile
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
531
diff
changeset
|
17 mv hg-evolve-$(VERSION) ../mercurial-evolve_$(VERSION).orig |
ca5bb72d14ae
pkg: abstract version in makefile
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
531
diff
changeset
|
18 cp -r debian/ ../mercurial-evolve_$(VERSION).orig/ |
ca5bb72d14ae
pkg: abstract version in makefile
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
531
diff
changeset
|
19 @cd ../mercurial-evolve_$(VERSION).orig && echo 'debian build directory ready at' `pwd` |