##// END OF EJS Templates
bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant...
bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant This patch is a follow-up to 56dd55da2f7d that resolves divergent bookmarks between the to-be-forwarded bookmark MARK and the new descendant. This situation can happen when pulling new changesets, updating to the divergent bookmark, abandoning the previous changesets with strip, and then moving MARK to MARK@N. Test coverage is added.

File last commit:

r14459:323c11da default
r19109:26c51e87 stable
Show More
Makefile
55 lines | 1.2 KiB | text/x-makefile | MakefileLexer
Bryan O'Sullivan
Move hgrc documentation out to its own man page, hgrc(5)....
r671 SOURCES=$(wildcard *.[0-9].txt)
MAN=$(SOURCES:%.txt=%)
HTML=$(SOURCES:%.txt=%.html)
Martin Geisler
doc/Makefile: docs now also depend on extensions...
r12921 GENDOC=gendoc.py ../mercurial/commands.py ../mercurial/help.py \
../mercurial/help/*.txt ../hgext/*.py ../hgext/*/__init__.py
wilde@trapperkeeper.sha-bang.de
Added install target.
r2233 PREFIX=/usr/local
Jonathan Smith <https://issues.rpath.com/>
install man pages by default into $(PREFIX)/share/man not $(PREFIX)/man since the FHS puts them there
r4030 MANDIR=$(PREFIX)/share/man
Christian Ebert
Do not install executable man pages...
r7686 INSTALL=install -c -m 644
Dirkjan Ochtman
use ${PYTHON} var in doc/Makefile as well
r6724 PYTHON=python
Nicolas Dumazet
runrst: add RSTARGS Makefile variable to allow customization...
r13054 RSTARGS=
mpm@selenic.com
Add a doc makefile...
r465
Wagner Bruna
doc/Makefile: fix doc generation when LANGUAGE is set
r10555 export LANGUAGE=C
Martin Geisler
doc/Makefile: ensure C locale...
r9971 export LC_ALL=C
Thomas Arendsen Hein
Generate html documentation by default, too.
r1006 all: man html
mpm@selenic.com
Add a doc makefile...
r465
man: $(MAN)
html: $(HTML)
Benoit Boissinot
generate hg manpage from commands.py docstring...
r1814 hg.1.txt: hg.1.gendoc.txt
touch hg.1.txt
Martin Geisler
doc/Makefile: add help/*.txt as a dependency
r9703 hg.1.gendoc.txt: $(GENDOC)
Martin Geisler
doc/Makefile: do not create files in case of errors...
r9444 ${PYTHON} gendoc.py > $@.tmp
mv $@.tmp $@
Benoit Boissinot
generate hg manpage from commands.py docstring...
r1814
Martin Geisler
doc: rebuild hgrc.5 man and HTML page when help/config changes
r14459 hgrc.5: ../mercurial/help/config.txt
hgrc.5.html: ../mercurial/help/config.txt
Martin Geisler
doc: link man pages to one another
r9162 %: %.txt common.txt
Nicolas Dumazet
runrst: add RSTARGS Makefile variable to allow customization...
r13054 $(PYTHON) runrst hgmanpage $(RSTARGS) --halt warning \
Martin Geisler
doc/Makefile: make rst2html and rst2man halt on warnings
r9445 --strip-elements-with-class htmlonly $*.txt $*
mpm@selenic.com
Add a doc makefile...
r465
Martin Geisler
doc: link man pages to one another
r9162 %.html: %.txt common.txt
Nicolas Dumazet
runrst: add RSTARGS Makefile variable to allow customization...
r13054 $(PYTHON) runrst html $(RSTARGS) --halt warning \
Martin Geisler
doc: add a style sheet to the generated HTML pages
r9626 --link-stylesheet --stylesheet-path style.css $*.txt $*.html
mpm@selenic.com
Add a doc makefile...
r465
Benoit Boissinot
fix MANIFEST generation
r3872 MANIFEST: man html
Mads Kiilerich
doc/Makefile: Don't show Makefile comments in output...
r9401 # tracked files are already in the main MANIFEST
Benoit Boissinot
fix MANIFEST generation
r3872 $(RM) $@
Martin Geisler
doc/Makefile: do not include hg.1.gendoc.txt in MANIFEST...
r12841 for i in $(MAN) $(HTML); do \
Benoit Boissinot
fix MANIFEST generation
r3872 echo "doc/$$i" >> $@ ; \
done
wilde@trapperkeeper.sha-bang.de
Added install target.
r2233 install: man
for i in $(MAN) ; do \
Cédric Duval
doc: fix regexp for determining the man page section...
r8822 subdir=`echo $$i | sed -n 's/^.*\.\([0-9]\)$$/man\1/p'` ; \
Adam Spiers
mercurial.spec: include CONTRIBUTORS, COPYING and man pages in rpm
r4753 mkdir -p $(DESTDIR)$(MANDIR)/$$subdir ; \
$(INSTALL) $$i $(DESTDIR)$(MANDIR)/$$subdir ; \
wilde@trapperkeeper.sha-bang.de
Added install target.
r2233 done
mpm@selenic.com
Add a doc makefile...
r465 clean:
Martin Geisler
doc/Makefile: cleanup clean target
r12840 $(RM) $(MAN) $(HTML) hg.1.gendoc.txt MANIFEST