Show More
@@ -52,7 +52,8 b' Example::' | |||
|
52 | 52 | # prefer svn- over cvs-like default keywordmaps |
|
53 | 53 | svn = True |
|
54 | 54 | |
|
55 | NOTE: the more specific you are in your filename patterns the less you | |
|
55 | .. note:: | |
|
56 | The more specific you are in your filename patterns the less you | |
|
56 | 57 | lose speed in huge repositories. |
|
57 | 58 | |
|
58 | 59 | For [keywordmaps] template mapping and expansion demonstration and |
@@ -1487,7 +1487,8 b' def export(ui, repo, *changesets, **opts' | |||
|
1487 | 1487 | branch name (if non-default), changeset hash, parent(s) and commit |
|
1488 | 1488 | comment. |
|
1489 | 1489 | |
|
1490 | NOTE: export may generate unexpected diff output for merge | |
|
1490 | .. note:: | |
|
1491 | export may generate unexpected diff output for merge | |
|
1491 | 1492 | changesets, as it will compare the merge changeset against its |
|
1492 | 1493 | first parent only. |
|
1493 | 1494 | |
@@ -2445,7 +2446,8 b' def log(ui, repo, *pats, **opts):' | |||
|
2445 | 2446 | each commit. When the -v/--verbose switch is used, the list of |
|
2446 | 2447 | changed files and full commit message are shown. |
|
2447 | 2448 | |
|
2448 | NOTE: log -p/--patch may generate unexpected diff output for merge | |
|
2449 | .. note:: | |
|
2450 | log -p/--patch may generate unexpected diff output for merge | |
|
2449 | 2451 | changesets, as it will only compare the merge changeset against |
|
2450 | 2452 | its first parent. Also, only files different from BOTH parents |
|
2451 | 2453 | will appear in files:. |
@@ -3002,11 +3004,13 b' def resolve(ui, repo, *pats, **opts):' | |||
|
3002 | 3004 | def revert(ui, repo, *pats, **opts): |
|
3003 | 3005 | """restore individual files or directories to an earlier state |
|
3004 | 3006 | |
|
3005 | NOTE: This command is most likely not what you are looking for. revert | |
|
3006 | will partially overwrite content in the working directory without changing | |
|
3007 | the working directory parents. Use :hg:`update -r rev` to check out earlier | |
|
3008 | revisions, or :hg:`update --clean .` to undo a merge which has added | |
|
3009 | another parent. | |
|
3007 | .. note:: | |
|
3008 | This command is most likely not what you are looking for. | |
|
3009 | revert will partially overwrite content in the working | |
|
3010 | directory without changing the working directory parents. Use | |
|
3011 | :hg:`update -r rev` to check out earlier revisions, or | |
|
3012 | :hg:`update --clean .` to undo a merge which has added another | |
|
3013 | parent. | |
|
3010 | 3014 | |
|
3011 | 3015 | With no revision specified, revert the named files or directories |
|
3012 | 3016 | to the contents they had in the parent of the working directory. |
@@ -3372,10 +3376,11 b' def status(ui, repo, *pats, **opts):' | |||
|
3372 | 3376 | Option -q/--quiet hides untracked (unknown and ignored) files |
|
3373 | 3377 | unless explicitly requested with -u/--unknown or -i/--ignored. |
|
3374 | 3378 | |
|
3375 | NOTE: status may appear to disagree with diff if permissions have | |
|
3376 | changed or a merge has occurred. The standard diff format does not | |
|
3377 | report permission changes and diff only reports changes relative | |
|
3378 | to one merge parent. | |
|
3379 | .. note:: | |
|
3380 | status may appear to disagree with diff if permissions have | |
|
3381 | changed or a merge has occurred. The standard diff format does | |
|
3382 | not report permission changes and diff only reports changes | |
|
3383 | relative to one merge parent. | |
|
3379 | 3384 | |
|
3380 | 3385 | If one revision is given, it is used as the base revision. |
|
3381 | 3386 | If two revisions are given, the differences between them are |
@@ -499,8 +499,9 b' Test command without options' | |||
|
499 | 499 | Option -q/--quiet hides untracked (unknown and ignored) files unless |
|
500 | 500 | explicitly requested with -u/--unknown or -i/--ignored. |
|
501 | 501 | |
|
502 | NOTE: status may appear to disagree with diff if permissions have changed | |
|
503 | or a merge has occurred. The standard diff format does not report | |
|
502 | Note: | |
|
503 | status may appear to disagree with diff if permissions have changed or | |
|
504 | a merge has occurred. The standard diff format does not report | |
|
504 | 505 | permission changes and diff only reports changes relative to one merge |
|
505 | 506 | parent. |
|
506 | 507 |
General Comments 0
You need to be logged in to leave comments.
Login now