Mercurial > public > mercurial-scm > hg-stable

diff tests/test-keyword.t @ 35606:4b68ca118d8d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pull: hold wlock for the full operation when --update is used With now, the wlock is not held between the pull and the update. This can lead to race condition and make logic checking to post pull results more complicated (eg: with _afterlock).
author Boris Feld <boris.feld@octobus.net>
date Thu, 11 Jan 2018 11:57:59 +0000
parents 4441705b7111
children 41ef02ba329b
line wrap: on
line diff
--- a/tests/test-keyword.t	Thu Jan 11 18:20:08 2018 +0800
+++ b/tests/test-keyword.t	Thu Jan 11 11:57:59 2018 +0000
@@ -262,6 +262,7 @@
   adding file changes
   added 2 changesets with 3 changes to 3 files
   new changesets a2392c293916:ef63ca68695b
+  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   MIME-Version: 1.0
   Content-Type: text/plain; charset="us-ascii"
   Content-Transfer-Encoding: 7bit
@@ -314,7 +315,6 @@
   +++ b/b	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +ignore $Id$
-  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ cp $HGRCPATH.nohooks $HGRCPATH