##// END OF EJS Templates
bookmarks: resolve divergent bookmarks when moving active bookmark forward...
bookmarks: resolve divergent bookmarks when moving active bookmark forward This patch resolves divergent bookmarks between the current active bookmark MARK and the new destination. This situation can arise when pulling new changesets, abandoning your current changesets actively bookmarked with MARK via strip, and then doing a bare update. The non-divergent but active bookmark MARK is then moved to a common ancestor of the new changesets and the abandoned changesets. Test coverage is added.
Sean Farley -
r19110:741d94aa 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.