Mercurial > evolve
view Makefile @ 5513:a8c21707e9c4
evolve: add test to show broken --continue case of content divergence
This test case demonstrates that during the resolution of content
divergence which includes relocation of "divergent" side but not
"other" and results in merge conflict during relocation, we can
lose some changes.
Next patch will fix this bug.
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Wed, 05 Aug 2020 00:16:26 +0530 |
parents | 77729ad7cb0c |
children | a86c2682f608 |
line wrap: on
line source
PYTHON ?= python VERSION = $(shell python setup.py --version) TESTFLAGS ?= $(shell echo $$HGTESTFLAGS) HGTESTS = $(HGROOT)/tests .PHONY: help help: @echo 'Commonly used make targets:' @echo ' deb-prepare - prepare the build of a debian package' @echo ' install-home - install with setup.py install --home=$$HOME ($(HOME))' @echo ' tests - run all tests in the automatic test suite' .PHONY: all all: help .PHONY: deb-prepare deb-prepare: python setup.py sdist --dist-dir .. mv -f ../hg-evolve-$(VERSION).tar.gz ../mercurial-evolve_$(VERSION).orig.tar.gz tar xf ../mercurial-evolve_$(VERSION).orig.tar.gz rm -rf ../mercurial-evolve_$(VERSION).orig mv hg-evolve-$(VERSION) ../mercurial-evolve_$(VERSION).orig cp -r debian/ ../mercurial-evolve_$(VERSION).orig/ @cd ../mercurial-evolve_$(VERSION).orig && echo 'debian build directory ready at' `pwd` .PHONY: install-home install-home: $(PYTHON) setup.py install --home="$(HOME)" --prefix="" --force .PHONY: doc doc: $(MAKE) -C docs .PHONY: _check_hgroot _check_hgroot: ifeq ($(HGROOT),) $(error HGROOT is not set to the root of the hg source tree) endif .PHONY: tests tests: _check_hgroot cd tests && $(PYTHON) $(HGTESTS)/run-tests.py $(TESTFLAGS) test-%: _check_hgroot cd tests && $(PYTHON) $(HGTESTS)/run-tests.py $(TESTFLAGS) $@