Show More
@@ -57,7 +57,8 b' def add(ui, repo, *pats, **opts):' | |||||
57 |
|
57 | |||
58 | Schedule files to be version controlled and added to the repository. |
|
58 | Schedule files to be version controlled and added to the repository. | |
59 |
|
59 | |||
60 | The files will be added to the repository at the next commit. |
|
60 | The files will be added to the repository at the next commit. To | |
|
61 | undo an add before that, see hg revert. | |||
61 |
|
62 | |||
62 | If no names are given, add all files in the repository. |
|
63 | If no names are given, add all files in the repository. | |
63 | """ |
|
64 | """ | |
@@ -650,7 +651,8 b' def copy(ui, repo, *pats, **opts):' | |||||
650 | stand in the working directory. If invoked with --after, the |
|
651 | stand in the working directory. If invoked with --after, the | |
651 | operation is recorded, but no copying is performed. |
|
652 | operation is recorded, but no copying is performed. | |
652 |
|
653 | |||
653 | This command takes effect in the next commit. |
|
654 | This command takes effect in the next commit. To undo a copy | |
|
655 | before that, see hg revert. | |||
654 | """ |
|
656 | """ | |
655 | wlock = repo.wlock(0) |
|
657 | wlock = repo.wlock(0) | |
656 | errs, copied = docopy(ui, repo, pats, opts, wlock) |
|
658 | errs, copied = docopy(ui, repo, pats, opts, wlock) | |
@@ -1861,12 +1863,14 b' def remove(ui, repo, *pats, **opts):' | |||||
1861 |
|
1863 | |||
1862 | Schedule the indicated files for removal from the repository. |
|
1864 | Schedule the indicated files for removal from the repository. | |
1863 |
|
1865 | |||
1864 | This command schedules the files to be removed at the next commit. |
|
|||
1865 | This only removes files from the current branch, not from the |
|
1866 | This only removes files from the current branch, not from the | |
1866 | entire project history. If the files still exist in the working |
|
1867 | entire project history. If the files still exist in the working | |
1867 | directory, they will be deleted from it. If invoked with --after, |
|
1868 | directory, they will be deleted from it. If invoked with --after, | |
1868 | files that have been manually deleted are marked as removed. |
|
1869 | files that have been manually deleted are marked as removed. | |
1869 |
|
1870 | |||
|
1871 | This command schedules the files to be removed at the next commit. | |||
|
1872 | To undo a remove before that, see hg revert. | |||
|
1873 | ||||
1870 | Modified files and added files are not removed by default. To |
|
1874 | Modified files and added files are not removed by default. To | |
1871 | remove them, use the -f/--force option. |
|
1875 | remove them, use the -f/--force option. | |
1872 | """ |
|
1876 | """ | |
@@ -1914,7 +1918,8 b' def rename(ui, repo, *pats, **opts):' | |||||
1914 | stand in the working directory. If invoked with --after, the |
|
1918 | stand in the working directory. If invoked with --after, the | |
1915 | operation is recorded, but no copying is performed. |
|
1919 | operation is recorded, but no copying is performed. | |
1916 |
|
1920 | |||
1917 | This command takes effect in the next commit. |
|
1921 | This command takes effect in the next commit. To undo a rename | |
|
1922 | before that, see hg revert. | |||
1918 | """ |
|
1923 | """ | |
1919 | wlock = repo.wlock(0) |
|
1924 | wlock = repo.wlock(0) | |
1920 | errs, copied = docopy(ui, repo, pats, opts, wlock) |
|
1925 | errs, copied = docopy(ui, repo, pats, opts, wlock) | |
@@ -1933,8 +1938,9 b' def revert(ui, repo, *pats, **opts):' | |||||
1933 | With no revision specified, revert the named files or directories |
|
1938 | With no revision specified, revert the named files or directories | |
1934 | to the contents they had in the parent of the working directory. |
|
1939 | to the contents they had in the parent of the working directory. | |
1935 | This restores the contents of the affected files to an unmodified |
|
1940 | This restores the contents of the affected files to an unmodified | |
1936 | state. If the working directory has two parents, you must |
|
1941 | state and unschedules adds, removes, copies, and renames. If the | |
1937 | explicitly specify the revision to revert to. |
|
1942 | working directory has two parents, you must explicitly specify the | |
|
1943 | revision to revert to. | |||
1938 |
|
1944 | |||
1939 | Modified files are saved with a .orig suffix before reverting. |
|
1945 | Modified files are saved with a .orig suffix before reverting. | |
1940 | To disable these backups, use --no-backup. |
|
1946 | To disable these backups, use --no-backup. |
@@ -136,7 +136,8 b' add the specified files on the next comm' | |||||
136 |
|
136 | |||
137 | Schedule files to be version controlled and added to the repository. |
|
137 | Schedule files to be version controlled and added to the repository. | |
138 |
|
138 | |||
139 | The files will be added to the repository at the next commit. |
|
139 | The files will be added to the repository at the next commit. To | |
|
140 | undo an add before that, see hg revert. | |||
140 |
|
141 | |||
141 | If no names are given, add all files in the repository. |
|
142 | If no names are given, add all files in the repository. | |
142 |
|
143 | |||
@@ -152,7 +153,8 b' add the specified files on the next comm' | |||||
152 |
|
153 | |||
153 | Schedule files to be version controlled and added to the repository. |
|
154 | Schedule files to be version controlled and added to the repository. | |
154 |
|
155 | |||
155 | The files will be added to the repository at the next commit. |
|
156 | The files will be added to the repository at the next commit. To | |
|
157 | undo an add before that, see hg revert. | |||
156 |
|
158 | |||
157 | If no names are given, add all files in the repository. |
|
159 | If no names are given, add all files in the repository. | |
158 |
|
160 | |||
@@ -169,6 +171,10 b' diff repository (or selected files)' | |||||
169 |
|
171 | |||
170 | Differences between files are shown using the unified diff format. |
|
172 | Differences between files are shown using the unified diff format. | |
171 |
|
173 | |||
|
174 | NOTE: diff may generate unexpected results for merges, as it will | |||
|
175 | default to comparing against the working directory's first parent | |||
|
176 | changeset if no revisions are specified. | |||
|
177 | ||||
172 | When two revision arguments are given, then changes are shown |
|
178 | When two revision arguments are given, then changes are shown | |
173 | between those revisions. If only one revision is specified then |
|
179 | between those revisions. If only one revision is specified then | |
174 | that revision is compared to the working directory, and, when no |
|
180 | that revision is compared to the working directory, and, when no | |
@@ -199,6 +205,11 b' show changed files in the working direct' | |||||
199 | files that match are shown. Files that are clean or ignored, are |
|
205 | files that match are shown. Files that are clean or ignored, are | |
200 | not listed unless -c (clean), -i (ignored) or -A is given. |
|
206 | not listed unless -c (clean), -i (ignored) or -A is given. | |
201 |
|
207 | |||
|
208 | NOTE: status may appear to disagree with diff if permissions have | |||
|
209 | changed or a merge has occurred. The standard diff format does not | |||
|
210 | report permission changes and diff only reports changes relative | |||
|
211 | to one merge parent. | |||
|
212 | ||||
202 | If one revision is given, it is used as the base revision. |
|
213 | If one revision is given, it is used as the base revision. | |
203 | If two revisions are given, the difference between them is shown. |
|
214 | If two revisions are given, the difference between them is shown. | |
204 |
|
215 |
@@ -118,6 +118,11 b' show changed files in the working direct' | |||||
118 | files that match are shown. Files that are clean or ignored, are |
|
118 | files that match are shown. Files that are clean or ignored, are | |
119 | not listed unless -c (clean), -i (ignored) or -A is given. |
|
119 | not listed unless -c (clean), -i (ignored) or -A is given. | |
120 |
|
120 | |||
|
121 | NOTE: status may appear to disagree with diff if permissions have | |||
|
122 | changed or a merge has occurred. The standard diff format does not | |||
|
123 | report permission changes and diff only reports changes relative | |||
|
124 | to one merge parent. | |||
|
125 | ||||
121 | If one revision is given, it is used as the base revision. |
|
126 | If one revision is given, it is used as the base revision. | |
122 | If two revisions are given, the difference between them is shown. |
|
127 | If two revisions are given, the difference between them is shown. | |
123 |
|
128 |
General Comments 0
You need to be logged in to leave comments.
Login now