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.

evolve: change in a test which demonstrate divergence resolution can break This patch just add "--any" flag to "hg evolve --content-divergent" in a test and changed output reflect that there is something which is not handled correctly. After looking into code I found that it is because of using a evolvestate value which is not updated i.e evolvestate['divergent'] Next patch will fix this problem.

tests: update the title of a test as it's not what it says I see that this test has conflict in relocation and in merging also. We do have a test for the case when only relocation leads to conflict.

obsexchange: avoid importing io/StringIO module with a different name Since we're not interested in the whole module, let's shorten the imports and aviod the lint warnings. Otherwise pep8-naming complains: - import io as StringIO: N812 lowercase imported as non lowercase - import StringIO as io: N813 camelcase imported as lowercase

evolve: remove unused StringIO import

evolve: unindent some lines caught by flake8 The message was: "E117 over-indented".

branching: overwrite broken merge with a correct one Thanks goes to Anton Shestakov for spotting and fixing this.

branching: merge with stable

branching: merge with stable

obshistory: omit keyword arguments with default values in patch.diffui() calls d4c9eebdd72d made that function not take "relroot" and "prefix" anymore, and instead expect "pathfn". These two chunks of code in this patch simply generate patches for obslog -p and they broke because they tried to provide default values for "prefix" and "relroot" for no apparent reason (and also for "changes"). Let's instead rely on defaults of patch.diffui().

branching: merge with stable

test: wider another time matching in prev/next lock testing There does not seems to be a reasons for specifically matching 4-6 seconds. Wider matching will avoid intermittent failure.

branching: merge with stable

test: wider time matching in prev/next lock testing There does not seems to be a reasons for specifically matching 4-6 seconds. Wider matching will avoid intermittent failure.

topic: make topics compatible with branchmap refactor See https://phab.mercurial-scm.org/D5290