tests/test-gendoc-fr.t

merge: move an inspection of the dirstate from record to calculate phase

The intent is clearly to have `calculateupdates()` figure out what
actions need to be taken and `recordupdates()` to make necessary
modifications to the dirstate. However, in the
`ACTION_PATH_CONFLICT_RESOLVE` case, there was one little inspection
of copy information done in `recordupdates()`. This patch moves that
to `calculateupdates()`. That will help with the next patch, which
makes `merge.update()` work better with `overlayworkingctx` (copies
should be recorded there too, even though we skip the
`recordupdates()` step).

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

#require docutils gettext

  $ $TESTDIR/check-gendoc fr
  checking for parse errors