D6475: merge: fix race that could cause wrong size in dirstate

[durin42 (Augie Fackler)]

durin42 added a comment.


  In D6475#94820 <https://phab.mercurial-scm.org/D6475#94820>, @martinvonz wrote:
  
  > Do you need to update the metadata in Phabricator to tell it that D6515 <https://phab.mercurial-scm.org/D6515> is its new parent?
  
  Looks like that is needed. Note that as of today, @ on hg-committed's phabricator extension fixes this up for you when you phabsend ;)

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6475/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6475

To: valentin.gatienbaron, durin42, martinvonz, #hg-reviewers
Cc: mercurial-devel