evolve: fix the broken behaviour on div resolution in relocation case In content divergence resolution, I see that when "relocationreq" is True which means both the cset are on different parent and relocation is required. In this case when "divergent" is the one who is behind the "other" cset in DAG, we swap them. At this point one thing we missed is to update the evolvestate['divergent']. Because of this in continue case we didn't get the right value of obsmarkers creation. In this patch I added the code to update the evolvestate when we swap them. Now as we know "divergent" and "other" can be swapped in some cases, it is better to store the intial divergent separately in evolvestate which is evolvestate['orig-divergent'] and later this value is used to update the evolvestate['replacements'] which is the track of revisions which has been resolved. Changes in tests demonstrate the fixed behaviour.

     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