diff --git a/hgext/eol.py b/hgext/eol.py --- a/hgext/eol.py +++ b/hgext/eol.py @@ -49,6 +49,7 @@ Example versioned ``.hgeol`` file:: native = LF .. note:: + The rules will first apply when files are touched in the working copy, e.g. by updating to null and back to tip to touch all files. diff --git a/hgext/keyword.py b/hgext/keyword.py --- a/hgext/keyword.py +++ b/hgext/keyword.py @@ -53,6 +53,7 @@ Example:: svn = True .. note:: + The more specific you are in your filename patterns the less you lose speed in huge repositories. diff --git a/hgext/mq.py b/hgext/mq.py --- a/hgext/mq.py +++ b/hgext/mq.py @@ -2622,6 +2622,7 @@ def guard(ui, repo, *args, **opts): With arguments, set guards for the named patch. .. note:: + Specifying negative guards now requires '--'. To set guards on another patch:: diff --git a/hgext/share.py b/hgext/share.py --- a/hgext/share.py +++ b/hgext/share.py @@ -17,6 +17,7 @@ def share(ui, source, dest=None, noupdat history with another repository. .. note:: + using rollback or extensions that destroy/modify history (mq, rebase, etc.) can cause considerable confusion with shared clones. In particular, if two shared clones are both updated to diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -397,6 +397,7 @@ def backout(ui, repo, node=None, rev=Non changes and the merged result is left uncommitted. .. note:: + backout cannot be used to fix either an unwanted or incorrect merge. @@ -937,6 +938,7 @@ def branch(ui, repo, label=None, **opts) """set or show the current branch name .. note:: + Branch names are permanent and global. Use :hg:`bookmark` to create a light-weight bookmark instead. See :hg:`help glossary` for more information about named branches and bookmarks. @@ -2707,6 +2709,7 @@ def diff(ui, repo, *pats, **opts): Differences between files are shown using the unified diff format. .. note:: + diff may generate unexpected results for merges, as it will default to comparing against the working directory's first parent changeset if no revisions are specified. @@ -2796,6 +2799,7 @@ def export(ui, repo, *changesets, **opts comment. .. note:: + export may generate unexpected diff output for merge changesets, as it will compare the merge changeset against its first parent only. @@ -2928,6 +2932,7 @@ def graft(ui, repo, *revs, **opts): continued with the -c/--continue option. .. note:: + The -c/--continue option does not reapply earlier options. .. container:: verbose @@ -3979,12 +3984,14 @@ def log(ui, repo, *pats, **opts): changed files and full commit message are shown. .. note:: + log -p/--patch may generate unexpected diff output for merge changesets, as it will only compare the merge changeset against its first parent. Also, only files different from BOTH parents will appear in files:. .. note:: + for performance reasons, log FILE may omit duplicate changes made on branches and will not show deletions. To see all changes including duplicates and deletions, use the --removed @@ -4652,6 +4659,7 @@ def push(ui, repo, dest=None, **opts): only create a new branch without forcing other changes. .. note:: + Extra care should be taken with the -f/--force option, which will push all new heads on all branches, an action which will almost always cause confusion for collaborators. @@ -4976,6 +4984,7 @@ def revert(ui, repo, *pats, **opts): """restore files to their checkout state .. note:: + To check out earlier revisions, you should use :hg:`update REV`. To cancel an uncommitted merge (and lose your changes), use :hg:`update --clean .`. @@ -5306,6 +5315,7 @@ def status(ui, repo, *pats, **opts): unless explicitly requested with -u/--unknown or -i/--ignored. .. note:: + status may appear to disagree with diff if permissions have changed or a merge has occurred. The standard diff format does not report permission changes and diff only reports changes