Fix 3-way-merge of original parent, workdir and new parent. The dirstate has to match what is in the repository (what would be checked out with 'hg update -C'), because the resulting file may be identical to the new parent, or it may be completely different. Previously the dirstate wasn't updated, so if you changed the file to look like the original parent, it might be considered unmodified relative to the new parent.

     1

SOURCES=$(wildcard *.[0-9].txt)

     2

MAN=$(SOURCES:%.txt=%)

     3

HTML=$(SOURCES:%.txt=%.html)

     4

     5

all: man

     6

     7

man: $(MAN)

     8

     9

html: $(HTML)

    10

    11

%: %.xml

    12

	xmlto man $*.xml

    13

    14

%.xml: %.txt

    15

	asciidoc -d manpage -b docbook $*.txt

    16

    17

%.html: %.txt

    18

	asciidoc -b html $*.txt

    19

    20

clean:

    21

	$(RM) $(MAN) $(MAN:%=%.xml) $(MAN:%=%.html)