upstream/mercurial-mirror Files · mercurial/templates

revert: drop requirement to use -r to revert with two parents...

revert: drop requirement to use -r to revert with two parents This reduces documentation confusion between the need to: a) hg revert -a -r . (drop all changes from a merge) b) hg up -C . (drop the second parent entirely) Currently revert is one of two commands (the other being tag) that still complains about uncommitted merges, dating from its former use of a generic defaultrev function that aborted.

Matt Mackall -


            r14542:afe0d4c2

default

Name	Size	Modified	Last Commit	Author
/ mercurial / templates
atom
coal
gitweb
monoblue
paper
raw
rss
spartan
static
map-cmdline.changelog	Loading ...
map-cmdline.compact	Loading ...
map-cmdline.default	Loading ...
map-cmdline.xml	Loading ...
template-vars.txt	Loading ...

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages