--- a/hgext/convert/bzr.py Sun Feb 28 19:37:56 2010 +0100
+++ b/hgext/convert/bzr.py Mon Mar 01 22:47:39 2010 +0100
@@ -14,6 +14,7 @@
demandimport.ignore.extend([
'bzrlib.transactions',
'bzrlib.urlutils',
+ 'ElementPath',
])
from mercurial.i18n import _
--- a/hgext/mq.py Sun Feb 28 19:37:56 2010 +0100
+++ b/hgext/mq.py Mon Mar 01 22:47:39 2010 +0100
@@ -2629,8 +2629,7 @@
return orig(ui, repo, *args, **kwargs)
def mqinit(orig, ui, *args, **kwargs):
- mq = kwargs['mq']
- del kwargs['mq']
+ mq = kwargs.pop('mq', None)
if not mq:
return orig(ui, *args, **kwargs)
@@ -2643,8 +2642,7 @@
"""Add --mq option to operate on patch repository instead of main"""
# some commands do not like getting unknown options
- mq = kwargs['mq']
- del kwargs['mq']
+ mq = kwargs.pop('mq', None)
if not mq:
return orig(ui, repo, *args, **kwargs)
--- a/mercurial/commands.py Sun Feb 28 19:37:56 2010 +0100
+++ b/mercurial/commands.py Mon Mar 01 22:47:39 2010 +0100
@@ -2529,26 +2529,31 @@
wlock.release()
def resolve(ui, repo, *pats, **opts):
- """retry file merges from a merge or update
-
- This command can cleanly retry unresolved file merges using file
- revisions preserved from the last update or merge.
-
- If a conflict is resolved manually, please note that the changes
- will be overwritten if the merge is retried with resolve. The
- -m/--mark switch should be used to mark the file as resolved.
-
- You can specify a set of files to operate on, or use the -a/--all
- switch to select all unresolved files.
-
- This command also allows listing resolved files and manually
- indicating whether or not files are resolved. All files must be
- marked as resolved before a commit is permitted.
-
- The codes used to show the status of files are::
-
- U = unresolved
- R = resolved
+ """various operations to help finish a merge
+
+ This command includes several actions that are often useful while
+ performing a merge, after running ``merge`` but before running
+ ``commit``. (It is only meaningful if your working directory has
+ two parents.) It is most relevant for merges with unresolved
+ conflicts, which are typically a result of non-interactive merging with
+ ``internal:merge`` or a command-line merge tool like ``diff3``.
+
+ The available actions are:
+
+ 1) list files that were merged with conflicts (U, for unresolved)
+ and without conflicts (R, for resolved): ``hg resolve -l``
+ (this is like ``status`` for merges)
+ 2) record that you have resolved conflicts in certain files:
+ ``hg resolve -m [file ...]`` (default: mark all unresolved files)
+ 3) forget that you have resolved conflicts in certain files:
+ ``hg resolve -u [file ...]`` (default: unmark all resolved files)
+ 4) discard your current attempt(s) at resolving conflicts and
+ restart the merge from scratch: ``hg resolve file...``
+ (or ``-a`` for all unresolved files)
+
+ Note that Mercurial will not let you commit files with unresolved merge
+ conflicts. You must use ``hg resolve -m ...`` before you can commit
+ after a conflicting merge.
"""
all, mark, unmark, show, nostatus = \
--- a/tests/test-globalopts.out Sun Feb 28 19:37:56 2010 +0100
+++ b/tests/test-globalopts.out Mon Mar 01 22:47:39 2010 +0100
@@ -184,7 +184,7 @@
recover roll back an interrupted transaction
remove remove the specified files on the next commit
rename rename files; equivalent of copy + remove
- resolve retry file merges from a merge or update
+ resolve various operations to help finish a merge
revert restore individual files or directories to an earlier state
rollback roll back the last transaction
root print the root (top) of the current working directory
@@ -253,7 +253,7 @@
recover roll back an interrupted transaction
remove remove the specified files on the next commit
rename rename files; equivalent of copy + remove
- resolve retry file merges from a merge or update
+ resolve various operations to help finish a merge
revert restore individual files or directories to an earlier state
rollback roll back the last transaction
root print the root (top) of the current working directory
--- a/tests/test-help.out Sun Feb 28 19:37:56 2010 +0100
+++ b/tests/test-help.out Mon Mar 01 22:47:39 2010 +0100
@@ -77,7 +77,7 @@
recover roll back an interrupted transaction
remove remove the specified files on the next commit
rename rename files; equivalent of copy + remove
- resolve retry file merges from a merge or update
+ resolve various operations to help finish a merge
revert restore individual files or directories to an earlier state
rollback roll back the last transaction
root print the root (top) of the current working directory
@@ -142,7 +142,7 @@
recover roll back an interrupted transaction
remove remove the specified files on the next commit
rename rename files; equivalent of copy + remove
- resolve retry file merges from a merge or update
+ resolve various operations to help finish a merge
revert restore individual files or directories to an earlier state
rollback roll back the last transaction
root print the root (top) of the current working directory
@@ -563,7 +563,7 @@
recover roll back an interrupted transaction
remove remove the specified files on the next commit
rename rename files; equivalent of copy + remove
- resolve retry file merges from a merge or update
+ resolve various operations to help finish a merge
revert restore individual files or directories to an earlier state
rollback roll back the last transaction
root print the root (top) of the current working directory