On 06/18/2017 08:09 AM, Yuya Nishihara wrote:
On Sat, 17 Jun 2017 11:43:59 +0200, Pierre-Yves David wrote:
# HG changeset patch
# User Pierre-Yves David <pierre-yves.da...@octobus.net>
# Date 1495923158 -7200
#      Sun May 28 00:12:38 2017 +0200
# Node ID 37ac2d3f1c505077f5684635df123a1fc31cf594
# Parent  29558247b00eff8c95c7604032b59cfbab34010d
# EXP-Topic pushrace
# Available At https://www.mercurial-scm.org/repo/users/marmoute/mercurial/
#              hg pull 
https://www.mercurial-scm.org/repo/users/marmoute/mercurial/ -r 37ac2d3f1c50
check-concurrency: expose the feature as 'check-concurrent-push-mode'

Queued, thanks.

Thanks! this make me spot a typo in the commit summary line (extra check-) in the config name. Should be:

check-concurrency: expose the feature as 'concurrent-push-mode'

Can you fix hg-committed?


+``concurrent-push-mode``
+    Level of allowed race condition between two pushing client.

s/client/clients/

and inserted empty line here so the following lines are rendered as lists.

+    - 'strict': push is abort if another client touched the repository
+      while the push was preparing. (default)
+    - 'check-related': push is only aborted if it affects head that got also
+      affected while the push was preparing.
+
+    This requires compatible client (version 4.3 and later). Old client will
+    use 'strict'.

--
Pierre-Yves David
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Reply via email to