merge with stable

mercurial/commands.py

@@ -4959,7 +4959,7 b' def resolve(ui, repo, *pats, **opts):'
         if hasconflictmarkers:
             ui.warn(_('warning: the following files still have conflict '
                       'markers:\n  ') + '\n  '.join(hasconflictmarkers) + '\n')
-            if markcheck == 'abort' and not all:
+            if markcheck == 'abort' and not all and not pats:
                 raise error.Abort(_('conflict markers detected'),
                                   hint=_('use --all to mark anyway'))
 

mercurial/help/internals/config.txt

@@ -99,10 +99,11 b' requiring a default value. The existing '
 then stay in use until compatibility with Mercurial 4.2 is dropped.
 
 As reminder, here are the default values for each config type:
-- config:      None
-- configbool:  False
-- configbytes: 0
-- configdate:  None
-- configint:   None
-- configlist:  []
-- configpath:  None
+
+    - config:      None
+    - configbool:  False
+    - configbytes: 0
+    - configdate:  None
+    - configint:   None
+    - configlist:  []
+    - configpath:  None

mercurial/hgweb/request.py

@@ -540,6 +540,12 b' class wsgiresponse(object):'
             yield self._bodybytes
         elif self._bodygen:
             for chunk in self._bodygen:
+                # PEP-3333 says that output must be bytes. And some WSGI
+                # implementations enforce this. We cast bytes-like types here
+                # for convenience.
+                if isinstance(chunk, bytearray):
+                    chunk = bytes(chunk)
+
                 yield chunk
         elif self._bodywillwrite:
             self._bodywritefn = write

mercurial/ui.py

@@ -67,9 +67,6 b' status.relative = yes'
 update.check = noconflict
 # Show conflicts information in `hg status`
 status.verbose = True
-# Refuse to perform `hg resolve --mark` on files that still have conflict
-# markers
-resolve.mark-check = abort
 
 [diff]
 git = 1

tests/test-resolve.t

@@ -445,6 +445,19 b" Test explicitly setting the option to 'n"
   $ hg resolve -l
   R file1
   R file2
+Test with marking an explicit file as resolved, this should not abort (since
+there's no --force flag, we have no way of combining --all with a filename)
+  $ hg resolve --unmark
+  $ hg resolve -l
+  U file1
+  U file2
+(This downgrades to a warning since an explicit file was specified).
+  $ hg --config commands.resolve.mark-check=abort resolve -m file2
+  warning: the following files still have conflict markers:
+    file2
+  $ hg resolve -l
+  U file1
+  R file2
 Testing the --re-merge flag
   $ hg resolve --unmark file1
   $ hg resolve -l