# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1577479316 28800
# Node ID 0750cbffdb3b4107c8054cad0d64bd1590392f37
# Parent  98944715a02c2bf9b2617f4724b08f01e03478ca
movedirstate: get copies from dirstate before setting parents

Setting dirstate parents can modify the copies recorded in the
dirstate when there are two dirstate parents. I don't think we ever
call movedirstate() when there is more than one parent, but it seems
clearer to get the copies from the dirstate first anyway.

Differential Revision: https://phab.mercurial-scm.org/D7800

diff -r 98944715a02c -r 0750cbffdb3b mercurial/scmutil.py
--- a/mercurial/scmutil.py	Thu Dec 12 14:31:11 2019 -0800
+++ b/mercurial/scmutil.py	Fri Dec 27 12:41:56 2019 -0800
@@ -1431,8 +1431,8 @@
     """
     oldctx = repo[b'.']
     ds = repo.dirstate
+    copies = dict(ds.copies())
     ds.setparents(newctx.node(), nullid)
-    copies = dict(ds.copies())
     s = newctx.status(oldctx, match=match)
     for f in s.modified:
         if ds[f] == b'r':