Show More
@@ -307,8 +307,8 b' format. We suggest you use the ``eol`` e' | |||||
307 | Use the ``[defaults]`` section to define command defaults, i.e. the |
|
307 | Use the ``[defaults]`` section to define command defaults, i.e. the | |
308 | default options/arguments to pass to the specified commands. |
|
308 | default options/arguments to pass to the specified commands. | |
309 |
|
309 | |||
310 |
The following example makes :hg:`log` run in verbose mode, and |
|
310 | The following example makes :hg:`log` run in verbose mode, and | |
311 | status` show only the modified files, by default:: |
|
311 | :hg:`status` show only the modified files, by default:: | |
312 |
|
312 | |||
313 | [defaults] |
|
313 | [defaults] | |
314 | log = -v |
|
314 | log = -v |
@@ -2948,31 +2948,35 b' def rename(ui, repo, *pats, **opts):' | |||||
2948 | wlock.release() |
|
2948 | wlock.release() | |
2949 |
|
2949 | |||
2950 | def resolve(ui, repo, *pats, **opts): |
|
2950 | def resolve(ui, repo, *pats, **opts): | |
2951 | """various operations to help finish a merge |
|
2951 | """redo merges or set/view the merge status of files | |
2952 |
|
2952 | |||
2953 | This command includes several actions that are often useful while |
|
2953 | Merges with unresolved conflicts are often the result of | |
2954 | performing a merge, after running ``merge`` but before running |
|
2954 | non-interactive merging using the ``internal:merge`` hgrc setting, | |
2955 | ``commit``. (It is only meaningful if your working directory has |
|
2955 | or a command-line merge tool like ``diff3``. The resolve command | |
2956 | two parents.) It is most relevant for merges with unresolved |
|
2956 | is used to manage the files involved in a merge, after :hg:`merge` | |
2957 | conflicts, which are typically a result of non-interactive merging with |
|
2957 | has been run, and before :hg:`commit` is run (i.e. the working | |
2958 | ``internal:merge`` or a command-line merge tool like ``diff3``. |
|
2958 | directory must have two parents). | |
2959 |
|
2959 | |||
2960 | The available actions are: |
|
2960 | The resolve command can be used in the following ways: | |
2961 |
|
2961 | |||
2962 | 1) list files that were merged with conflicts (U, for unresolved) |
|
2962 | - :hg:`resolve FILE...`: attempt to re-merge the specified files, | |
2963 | and without conflicts (R, for resolved): ``hg resolve -l`` |
|
2963 | discarding any previous merge attempts. Re-merging is not | |
2964 | (this is like ``status`` for merges) |
|
2964 | performed for files already marked as resolved. Use ``--all/-a`` | |
2965 | 2) record that you have resolved conflicts in certain files: |
|
2965 | to selects all unresolved files. | |
2966 | ``hg resolve -m [file ...]`` (default: mark all unresolved files) |
|
2966 | ||
2967 | 3) forget that you have resolved conflicts in certain files: |
|
2967 | - :hg:`resolve -m [FILE]`: mark a file as having been resolved | |
2968 | ``hg resolve -u [file ...]`` (default: unmark all resolved files) |
|
2968 | (e.g. after having manually fixed-up the files). The default is | |
2969 | 4) discard your current attempt(s) at resolving conflicts and |
|
2969 | to mark all unresolved files. | |
2970 | restart the merge from scratch: ``hg resolve file...`` |
|
2970 | ||
2971 | (or ``-a`` for all unresolved files) |
|
2971 | - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The | |
2972 |
|
2972 | default is to mark all resolved files. | ||
2973 | Note that Mercurial will not let you commit files with unresolved merge |
|
2973 | ||
2974 | conflicts. You must use ``hg resolve -m ...`` before you can commit |
|
2974 | - :hg:`resolve -l`: list files which had or still have conflicts. | |
2975 | after a conflicting merge. |
|
2975 | In the printed list, ``U`` = unresolved and ``R`` = resolved. | |
|
2976 | ||||
|
2977 | Note that Mercurial will not let you commit files with unresolved | |||
|
2978 | merge conflicts. You must use :hg:`resolve -m ...` before you can | |||
|
2979 | commit after a conflicting merge. | |||
2976 |
|
2980 | |||
2977 | Returns 0 on success, 1 if any files fail a resolve attempt. |
|
2981 | Returns 0 on success, 1 if any files fail a resolve attempt. | |
2978 | """ |
|
2982 | """ | |
@@ -4340,7 +4344,7 b' table = {' | |||||
4340 | [('a', 'all', None, _('select all unresolved files')), |
|
4344 | [('a', 'all', None, _('select all unresolved files')), | |
4341 | ('l', 'list', None, _('list state of files needing merge')), |
|
4345 | ('l', 'list', None, _('list state of files needing merge')), | |
4342 | ('m', 'mark', None, _('mark files as resolved')), |
|
4346 | ('m', 'mark', None, _('mark files as resolved')), | |
4343 |
('u', 'unmark', None, _(' |
|
4347 | ('u', 'unmark', None, _('mark files as unresolved')), | |
4344 | ('n', 'no-status', None, _('hide status prefix'))] |
|
4348 | ('n', 'no-status', None, _('hide status prefix'))] | |
4345 | + walkopts, |
|
4349 | + walkopts, | |
4346 | _('[OPTION]... [FILE]...')), |
|
4350 | _('[OPTION]... [FILE]...')), |
@@ -134,3 +134,15 b" hg --cwd b ci -d '5 0' -m 'merge'" | |||||
134 | hg convert -d svn b |
|
134 | hg convert -d svn b | |
135 | echo % expect 4 changes |
|
135 | echo % expect 4 changes | |
136 | svnupanddisplay b-hg-wc 0 |
|
136 | svnupanddisplay b-hg-wc 0 | |
|
137 | ||||
|
138 | echo % tags are not supported, but must not break conversion | |||
|
139 | ||||
|
140 | rm -rf a a-hg a-hg-wc | |||
|
141 | hg init a | |||
|
142 | echo a > a/a | |||
|
143 | hg --cwd a ci -d '0 0' -A -m 'Add file a' | |||
|
144 | hg --cwd a tag -d '1 0' -m 'Tagged as v1.0' v1.0 | |||
|
145 | ||||
|
146 | hg convert -d svn a | |||
|
147 | svnupanddisplay a-hg-wc 2 | |||
|
148 | rm -rf a a-hg a-hg-wc |
@@ -335,3 +335,41 b' At revision 4.' | |||||
335 | <msg>base</msg> |
|
335 | <msg>base</msg> | |
336 | </logentry> |
|
336 | </logentry> | |
337 | </log> |
|
337 | </log> | |
|
338 | % tags are not supported, but must not break conversion | |||
|
339 | adding a | |||
|
340 | assuming destination a-hg | |||
|
341 | initializing svn repository 'a-hg' | |||
|
342 | initializing svn working copy 'a-hg-wc' | |||
|
343 | scanning source... | |||
|
344 | sorting... | |||
|
345 | converting... | |||
|
346 | 1 Add file a | |||
|
347 | 0 Tagged as v1.0 | |||
|
348 | writing Subversion tags is not yet implemented | |||
|
349 | At revision 2. | |||
|
350 | 2 2 test . | |||
|
351 | 2 1 test a | |||
|
352 | 2 2 test .hgtags | |||
|
353 | <?xml version="1.0"?> | |||
|
354 | <log> | |||
|
355 | <logentry | |||
|
356 | revision="2"> | |||
|
357 | <author>test</author> | |||
|
358 | <date/> | |||
|
359 | <paths> | |||
|
360 | <path | |||
|
361 | action="A">/.hgtags</path> | |||
|
362 | </paths> | |||
|
363 | <msg>Tagged as v1.0</msg> | |||
|
364 | </logentry> | |||
|
365 | <logentry | |||
|
366 | revision="1"> | |||
|
367 | <author>test</author> | |||
|
368 | <date/> | |||
|
369 | <paths> | |||
|
370 | <path | |||
|
371 | action="A">/a</path> | |||
|
372 | </paths> | |||
|
373 | <msg>Add file a</msg> | |||
|
374 | </logentry> | |||
|
375 | </log> |
General Comments 0
You need to be logged in to leave comments.
Login now