mq: smarter handling of plain headers 6333412245ec and 5ccced6eab0b fixed issue4453 with a simple insertplainheader function that fixed the regression but didn't make the implementation more stable. Now we introduce plain header handling similar to how we handle hg patches. The whole header is scanned for fields to update while determining the best position for inserting the field if it is missing. It also makes sure there is an empty line between headers and body.

     1

#require symlink

     2

     3

http://mercurial.selenic.com/bts/issue1438

     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