Show More
@@ -49,6 +49,7 b' Example versioned ``.hgeol`` file::' | |||
|
49 | 49 | native = LF |
|
50 | 50 | |
|
51 | 51 | .. note:: |
|
52 | ||
|
52 | 53 | The rules will first apply when files are touched in the working |
|
53 | 54 | copy, e.g. by updating to null and back to tip to touch all files. |
|
54 | 55 |
@@ -53,6 +53,7 b' Example::' | |||
|
53 | 53 | svn = True |
|
54 | 54 | |
|
55 | 55 | .. note:: |
|
56 | ||
|
56 | 57 | The more specific you are in your filename patterns the less you |
|
57 | 58 | lose speed in huge repositories. |
|
58 | 59 |
@@ -2622,6 +2622,7 b' def guard(ui, repo, *args, **opts):' | |||
|
2622 | 2622 | With arguments, set guards for the named patch. |
|
2623 | 2623 | |
|
2624 | 2624 | .. note:: |
|
2625 | ||
|
2625 | 2626 | Specifying negative guards now requires '--'. |
|
2626 | 2627 | |
|
2627 | 2628 | To set guards on another patch:: |
@@ -17,6 +17,7 b' def share(ui, source, dest=None, noupdat' | |||
|
17 | 17 | history with another repository. |
|
18 | 18 | |
|
19 | 19 | .. note:: |
|
20 | ||
|
20 | 21 | using rollback or extensions that destroy/modify history (mq, |
|
21 | 22 | rebase, etc.) can cause considerable confusion with shared |
|
22 | 23 | clones. In particular, if two shared clones are both updated to |
@@ -397,6 +397,7 b' def backout(ui, repo, node=None, rev=Non' | |||
|
397 | 397 | changes and the merged result is left uncommitted. |
|
398 | 398 | |
|
399 | 399 | .. note:: |
|
400 | ||
|
400 | 401 | backout cannot be used to fix either an unwanted or |
|
401 | 402 | incorrect merge. |
|
402 | 403 | |
@@ -937,6 +938,7 b' def branch(ui, repo, label=None, **opts)' | |||
|
937 | 938 | """set or show the current branch name |
|
938 | 939 | |
|
939 | 940 | .. note:: |
|
941 | ||
|
940 | 942 | Branch names are permanent and global. Use :hg:`bookmark` to create a |
|
941 | 943 | light-weight bookmark instead. See :hg:`help glossary` for more |
|
942 | 944 | information about named branches and bookmarks. |
@@ -2707,6 +2709,7 b' def diff(ui, repo, *pats, **opts):' | |||
|
2707 | 2709 | Differences between files are shown using the unified diff format. |
|
2708 | 2710 | |
|
2709 | 2711 | .. note:: |
|
2712 | ||
|
2710 | 2713 | diff may generate unexpected results for merges, as it will |
|
2711 | 2714 | default to comparing against the working directory's first |
|
2712 | 2715 | parent changeset if no revisions are specified. |
@@ -2796,6 +2799,7 b' def export(ui, repo, *changesets, **opts' | |||
|
2796 | 2799 | comment. |
|
2797 | 2800 | |
|
2798 | 2801 | .. note:: |
|
2802 | ||
|
2799 | 2803 | export may generate unexpected diff output for merge |
|
2800 | 2804 | changesets, as it will compare the merge changeset against its |
|
2801 | 2805 | first parent only. |
@@ -2928,6 +2932,7 b' def graft(ui, repo, *revs, **opts):' | |||
|
2928 | 2932 | continued with the -c/--continue option. |
|
2929 | 2933 | |
|
2930 | 2934 | .. note:: |
|
2935 | ||
|
2931 | 2936 | The -c/--continue option does not reapply earlier options. |
|
2932 | 2937 | |
|
2933 | 2938 | .. container:: verbose |
@@ -3979,12 +3984,14 b' def log(ui, repo, *pats, **opts):' | |||
|
3979 | 3984 | changed files and full commit message are shown. |
|
3980 | 3985 | |
|
3981 | 3986 | .. note:: |
|
3987 | ||
|
3982 | 3988 | log -p/--patch may generate unexpected diff output for merge |
|
3983 | 3989 | changesets, as it will only compare the merge changeset against |
|
3984 | 3990 | its first parent. Also, only files different from BOTH parents |
|
3985 | 3991 | will appear in files:. |
|
3986 | 3992 | |
|
3987 | 3993 | .. note:: |
|
3994 | ||
|
3988 | 3995 | for performance reasons, log FILE may omit duplicate changes |
|
3989 | 3996 | made on branches and will not show deletions. To see all |
|
3990 | 3997 | changes including duplicates and deletions, use the --removed |
@@ -4652,6 +4659,7 b' def push(ui, repo, dest=None, **opts):' | |||
|
4652 | 4659 | only create a new branch without forcing other changes. |
|
4653 | 4660 | |
|
4654 | 4661 | .. note:: |
|
4662 | ||
|
4655 | 4663 | Extra care should be taken with the -f/--force option, |
|
4656 | 4664 | which will push all new heads on all branches, an action which will |
|
4657 | 4665 | almost always cause confusion for collaborators. |
@@ -4976,6 +4984,7 b' def revert(ui, repo, *pats, **opts):' | |||
|
4976 | 4984 | """restore files to their checkout state |
|
4977 | 4985 | |
|
4978 | 4986 | .. note:: |
|
4987 | ||
|
4979 | 4988 | To check out earlier revisions, you should use :hg:`update REV`. |
|
4980 | 4989 | To cancel an uncommitted merge (and lose your changes), |
|
4981 | 4990 | use :hg:`update --clean .`. |
@@ -5306,6 +5315,7 b' def status(ui, repo, *pats, **opts):' | |||
|
5306 | 5315 | unless explicitly requested with -u/--unknown or -i/--ignored. |
|
5307 | 5316 | |
|
5308 | 5317 | .. note:: |
|
5318 | ||
|
5309 | 5319 | status may appear to disagree with diff if permissions have |
|
5310 | 5320 | changed or a merge has occurred. The standard diff format does |
|
5311 | 5321 | not report permission changes and diff only reports changes |
General Comments 0
You need to be logged in to leave comments.
Login now