facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-06 23:07:18 +03:00
Code Issues Projects Releases Wiki Activity

Use note admonition

Browse Source
This commit is contained in:
Erik Zielke 2010-09-22 16:23:55 +02:00
parent 208cfeec63
commit c732a9771b
4 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hgext/mq.py
View File

@ -2174,7 +2174,9 @@ def guard(ui, repo, *args, **opts):
With no arguments, print the currently active guards.
With arguments, set guards for the named patch.
NOTE: Specifying negative guards now requires '--'.
.. note::
Specifying negative guards now requires '--'.
To set guards on another patch::

19
hgext/share.py
View File

@ -14,15 +14,16 @@ def share(ui, source, dest=None, noupdate=False):
Initialize a new repository and working directory that shares its
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
the same changeset, and one of them destroys that changeset with
rollback, the other clone will suddenly stop working: all
operations will fail with "abort: working directory has unknown
parent". The only known workaround is to use debugsetparents on
the broken clone to reset it to a changeset that still exists
(e.g. tip).
.. 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
the same changeset, and one of them destroys that changeset
with rollback, the other clone will suddenly stop working: all
operations will fail with "abort: working directory has unknown
parent". The only known workaround is to use debugsetparents on
the broken clone to reset it to a changeset that still exists
(e.g. tip).
"""
return hg.share(ui, source, dest, not noupdate)

7
mercurial/commands.py
View File

@ -1432,9 +1432,10 @@ 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.
.. 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.
When two revision arguments are given, then changes are shown
between those revisions. If only one revision is specified then

7
tests/test-help.t
View File

@ -439,9 +439,10 @@ Test command without options
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.
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.
When two revision arguments are given, then changes are shown between
those revisions. If only one revision is specified then that revision is