1485 |
1485 |
1486 The information shown in the changeset header is: author, date, |
1486 The information shown in the changeset header is: author, date, |
1487 branch name (if non-default), changeset hash, parent(s) and commit |
1487 branch name (if non-default), changeset hash, parent(s) and commit |
1488 comment. |
1488 comment. |
1489 |
1489 |
1490 NOTE: export may generate unexpected diff output for merge |
1490 .. note:: |
1491 changesets, as it will compare the merge changeset against its |
1491 export may generate unexpected diff output for merge |
1492 first parent only. |
1492 changesets, as it will compare the merge changeset against its |
|
1493 first parent only. |
1493 |
1494 |
1494 Output may be to a file, in which case the name of the file is |
1495 Output may be to a file, in which case the name of the file is |
1495 given using a format string. The formatting rules are as follows: |
1496 given using a format string. The formatting rules are as follows: |
1496 |
1497 |
1497 :``%%``: literal "%" character |
1498 :``%%``: literal "%" character |
2443 By default this command prints revision number and changeset id, |
2444 By default this command prints revision number and changeset id, |
2444 tags, non-trivial parents, user, date and time, and a summary for |
2445 tags, non-trivial parents, user, date and time, and a summary for |
2445 each commit. When the -v/--verbose switch is used, the list of |
2446 each commit. When the -v/--verbose switch is used, the list of |
2446 changed files and full commit message are shown. |
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:: |
2449 changesets, as it will only compare the merge changeset against |
2450 log -p/--patch may generate unexpected diff output for merge |
2450 its first parent. Also, only files different from BOTH parents |
2451 changesets, as it will only compare the merge changeset against |
2451 will appear in files:. |
2452 its first parent. Also, only files different from BOTH parents |
|
2453 will appear in files:. |
2452 |
2454 |
2453 Returns 0 on success. |
2455 Returns 0 on success. |
2454 """ |
2456 """ |
2455 |
2457 |
2456 matchfn = cmdutil.match(repo, pats, opts) |
2458 matchfn = cmdutil.match(repo, pats, opts) |
3000 return ret |
3002 return ret |
3001 |
3003 |
3002 def revert(ui, repo, *pats, **opts): |
3004 def revert(ui, repo, *pats, **opts): |
3003 """restore individual files or directories to an earlier state |
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 |
3007 .. note:: |
3006 will partially overwrite content in the working directory without changing |
3008 This command is most likely not what you are looking for. |
3007 the working directory parents. Use :hg:`update -r rev` to check out earlier |
3009 revert will partially overwrite content in the working |
3008 revisions, or :hg:`update --clean .` to undo a merge which has added |
3010 directory without changing the working directory parents. Use |
3009 another parent. |
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 With no revision specified, revert the named files or directories |
3015 With no revision specified, revert the named files or directories |
3012 to the contents they had in the parent of the working directory. |
3016 to the contents they had in the parent of the working directory. |
3013 This restores the contents of the affected files to an unmodified |
3017 This restores the contents of the affected files to an unmodified |
3014 state and unschedules adds, removes, copies, and renames. If the |
3018 state and unschedules adds, removes, copies, and renames. If the |
3370 options -mardu are used. |
3374 options -mardu are used. |
3371 |
3375 |
3372 Option -q/--quiet hides untracked (unknown and ignored) files |
3376 Option -q/--quiet hides untracked (unknown and ignored) files |
3373 unless explicitly requested with -u/--unknown or -i/--ignored. |
3377 unless explicitly requested with -u/--unknown or -i/--ignored. |
3374 |
3378 |
3375 NOTE: status may appear to disagree with diff if permissions have |
3379 .. note:: |
3376 changed or a merge has occurred. The standard diff format does not |
3380 status may appear to disagree with diff if permissions have |
3377 report permission changes and diff only reports changes relative |
3381 changed or a merge has occurred. The standard diff format does |
3378 to one merge parent. |
3382 not report permission changes and diff only reports changes |
|
3383 relative to one merge parent. |
3379 |
3384 |
3380 If one revision is given, it is used as the base revision. |
3385 If one revision is given, it is used as the base revision. |
3381 If two revisions are given, the differences between them are |
3386 If two revisions are given, the differences between them are |
3382 shown. The --change option can also be used as a shortcut to list |
3387 shown. The --change option can also be used as a shortcut to list |
3383 the changed files of a revision from its first parent. |
3388 the changed files of a revision from its first parent. |