Mercurial > public > mercurial-scm > hg
comparison mercurial/merge.py @ 34125:57dc78d757ff
merge: flush any deferred writes just before recordupdates()
``recordupdates`` calls into the dirstate which requires the files to be
there, so this is the last possible moment we can flush anything.
Differential Revision: https://phab.mercurial-scm.org/D673
| author | Phil Cohen <phillco@fb.com> |
|---|---|
| date | Mon, 11 Sep 2017 13:17:43 -0700 |
| parents | b90e5b2a9c82 |
| children | 24bf823377fc |
comparison
equal
deleted
inserted
replaced
| 34124:b90e5b2a9c82 | 34125:57dc78d757ff |
|---|---|
| 1710 repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2) | 1710 repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2) |
| 1711 # note that we're in the middle of an update | 1711 # note that we're in the middle of an update |
| 1712 repo.vfs.write('updatestate', p2.hex()) | 1712 repo.vfs.write('updatestate', p2.hex()) |
| 1713 | 1713 |
| 1714 stats = applyupdates(repo, actions, wc, p2, overwrite, labels=labels) | 1714 stats = applyupdates(repo, actions, wc, p2, overwrite, labels=labels) |
| 1715 wc.flushall() | |
| 1715 | 1716 |
| 1716 if not partial: | 1717 if not partial: |
| 1717 with repo.dirstate.parentchange(): | 1718 with repo.dirstate.parentchange(): |
| 1718 repo.setparents(fp1, fp2) | 1719 repo.setparents(fp1, fp2) |
| 1719 recordupdates(repo, actions, branchmerge) | 1720 recordupdates(repo, actions, branchmerge) |