Read about our upcoming Code of Conduct on this issue

evolve: delete redundant and incorrect code for updating dirstate

In relocate() when we notice conflicts, we will try to fix up the
dirstate by calling copies.duplicatecopies() and
dirstatedance(). However, we had called _evolvemerge() just before
that point and that has already fixed up the dirstate, so there's no
need to do it again. Also, we did it incorrectly as the test case
shows.
6 jobs for topic/default/evolve-copies in 6 minutes and 8 seconds (queued for 1 minute and 24 seconds)
Status Name Job ID Coverage
  Test
passed doc #52015

00:00:30

passed flake8 #52010

00:00:36

passed tests-py2-cext #52011

00:04:41

passed tests-py2-pure #52012

00:03:31

passed tests-py3-cext #52013

00:04:45

passed tests-py3-pure #52014

00:02:32