filemerge: when not keeping premerge, don't write markers to context When premerge is enabled (as it is for non-binary inputs by default) and the markers are not kept, we currently still write it to the output context and then restore the previous content right after. With the refactoring in the previous patch, we can easily avoid that step and instead write the output in the opposite case (i.e. when it's successful or when the markers are supposed to be kept). Differential Revision: https://phab.mercurial-scm.org/D12149

     1

#require symlink

     2

     3

https://bz.mercurial-scm.org/1438

     4

     5

  $ hg init

     6

     7

  $ ln -s foo link

     8

  $ hg add link

     9

  $ hg ci -mbad link

    10

  $ hg rm link

    11

  $ hg ci -mok

    12

  $ hg diff -g -r 0:1 > bad.patch

    13

    14

  $ hg up 0

    15

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

    16

    17

  $ hg import --no-commit bad.patch

    18

  applying bad.patch

    19

    20

  $ hg status

    21

  R link

    22

  ? bad.patch

    23