##// END OF EJS Templates
fix: update documentation to reflect preference for --source over --rev...
Martin von Zweigbergk -
r45777:3ea3b85d default
parent child Browse files
Show More
@@ -241,15 +241,15 b' def fix(ui, repo, *pats, **opts):'
241 of files, unless the --whole flag is used. Some tools may always affect the
241 of files, unless the --whole flag is used. Some tools may always affect the
242 whole file regardless of --whole.
242 whole file regardless of --whole.
243
243
244 If revisions are specified with --rev, those revisions will be checked, and
244 If --working-dir is used, files with uncommitted changes in the working copy
245 they may be replaced with new revisions that have fixed file content. It is
245 will be fixed. Note that no backup are made.
246 desirable to specify all descendants of each specified revision, so that the
247 fixes propagate to the descendants. If all descendants are fixed at the same
248 time, no merging, rebasing, or evolution will be required.
249
246
250 If --working-dir is used, files with uncommitted changes in the working copy
247 If revisions are specified with --source, those revisions and their
251 will be fixed. If the checked-out revision is also fixed, the working
248 descendants will be checked, and they may be replaced with new revisions
252 directory will update to the replacement revision.
249 that have fixed file content. By automatically including the descendants,
250 no merging, rebasing, or evolution will be required. If an ancestor of the
251 working copy is included, then the working copy itself will also be fixed,
252 and the working copy will be updated to the fixed parent.
253
253
254 When determining what lines of each file to fix at each revision, the whole
254 When determining what lines of each file to fix at each revision, the whole
255 set of revisions being fixed is considered, so that fixes to earlier
255 set of revisions being fixed is considered, so that fixes to earlier
@@ -84,15 +84,15 b' Help text for fix.'
84 lines of files, unless the --whole flag is used. Some tools may always
84 lines of files, unless the --whole flag is used. Some tools may always
85 affect the whole file regardless of --whole.
85 affect the whole file regardless of --whole.
86
86
87 If revisions are specified with --rev, those revisions will be checked,
87 If --working-dir is used, files with uncommitted changes in the working
88 and they may be replaced with new revisions that have fixed file content.
88 copy will be fixed. Note that no backup are made.
89 It is desirable to specify all descendants of each specified revision, so
90 that the fixes propagate to the descendants. If all descendants are fixed
91 at the same time, no merging, rebasing, or evolution will be required.
92
89
93 If --working-dir is used, files with uncommitted changes in the working
90 If revisions are specified with --source, those revisions and their
94 copy will be fixed. If the checked-out revision is also fixed, the working
91 descendants will be checked, and they may be replaced with new revisions
95 directory will update to the replacement revision.
92 that have fixed file content. By automatically including the descendants,
93 no merging, rebasing, or evolution will be required. If an ancestor of the
94 working copy is included, then the working copy itself will also be fixed,
95 and the working copy will be updated to the fixed parent.
96
96
97 When determining what lines of each file to fix at each revision, the
97 When determining what lines of each file to fix at each revision, the
98 whole set of revisions being fixed is considered, so that fixes to earlier
98 whole set of revisions being fixed is considered, so that fixes to earlier
General Comments 0
You need to be logged in to leave comments. Login now