##// 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.
Sean Farley -
r19109:26c51e87 stable
Show More
Name Size Modified Last Commit Author
/ doc
Makefile Loading ...
README Loading ...
check-seclevel.py Loading ...
common.txt Loading ...
gendoc.py Loading ...
hg.1.txt Loading ...
hgignore.5.txt Loading ...
hgmanpage.py Loading ...
hgrc.5.txt Loading ...
runrst Loading ...
style.css Loading ...

Mercurial's documentation is kept in reStructuredText format, which is
a simple plain text format that's easy to read and edit:

http://docutils.sourceforge.net/rst.html

It's also convertible to a variety of other formats including standard
UNIX man page format and HTML. You'll need to install Docutils:

http://docutils.sourceforge.net/

Use the Makefile in this directory to generate the man and HTML pages.