evolve: use merge.update() for resolving phase divergence Iterating over the manifest when tree manifests and narrowness is in play produces entries for paths outside the narrowspec that represent trees. For example, if the tests/ directory of the hg repo was not in the narrowspec (and the hg repo was using tree manifests, which it doesn't), then there would be a "tests/" entry in the manifest. The merge code deals with some of these cases. For example, it's valid to do a merge if only the local side changes directories outside the narrowspec. That allows rebasing a local commit onto a public commit that had changes to the excluded paths to work. However, _resolvephasedivergent() was iterating of the manifests, which resulted in crashes for some of our users when they tried to resolve phase-divergent commits (actually content-divergent commits that became phase-divergent after the intermediate rebase). We can fix that by relying on merge.update(), since that already handles this case.

     1

#!/usr/bin/make -f

     2

#export DH_VERBOSE=1

     3

     4

%:

     5

	dh $@ --with python2 --buildsystem=python_distutils

     6

     7

override_dh_auto_build:

     8

	dh_auto_build

     9

	$(MAKE) -C docs

    10

    11

hgsrc_defined:

    12

	# Use "! -z" instead of "-n", because "-n" without arguments is true

    13

	test ! -z $(HGSRC) && test -d $(HGSRC) || (echo "$(HGSRC) is not a directory"; false)

    14

    15

ifeq (,$(filter nocheck, $(DEB_BUILD_OPTIONS)))

    16

override_dh_auto_test: hgsrc_defined

    17

	cd tests && python $(HGSRC)/tests/run-tests.py --with-hg=$(HGSRC)/hg --blacklist=$(CURDIR)/debian/test-blacklist

    18

endif

    19

    20

override_dh_python2:

    21

	# avoid conflict with mercurial's own hgext3rd/__init__.py

    22

	find debian -path '*/hgext3rd/__init__.py' -delete

    23

	dh_python2

    24

    25

override_dh_auto_clean: clean-docs

    26

	dh_auto_clean

    27

	rm -f tests/*.err

    28

    29

clean-docs:

    30

	rm -rf html

    31

	rm -f docs/static/logo-evolve.ico

    32

	rm -f docs/tutorials/tutorial.rst

    33

	rm -f docs/tutorials/topic-tutorial.rst