# HG changeset patch
# User Benoit Boissinot <benoit.boissinot@ens-lyon.org>
# Date 1140562253 -3600
# Node ID 750b9cd8396511d40767cd5e40e4467b3253e043
# Parent  e431344e604c986d95314ba7ce35d8f0e2a7a066
change the default timeout to 600 seconds


diff -r e431344e604c -r 750b9cd83965 doc/hgrc.5.txt
--- a/doc/hgrc.5.txt	Tue Feb 21 23:21:15 2006 +0100
+++ b/doc/hgrc.5.txt	Tue Feb 21 23:50:53 2006 +0100
@@ -249,7 +249,7 @@
     command to use for SSH connections. Default is 'ssh'.
   timeout;;
     The timeout used when a lock is held (in seconds), a negative value
-    means no timeout. Default is 1024.
+    means no timeout. Default is 600.
   username;;
     The committer of a changeset created when running "commit".
     Typically a person's name and email address, e.g. "Fred Widget
diff -r e431344e604c -r 750b9cd83965 mercurial/localrepo.py
--- a/mercurial/localrepo.py	Tue Feb 21 23:21:15 2006 +0100
+++ b/mercurial/localrepo.py	Tue Feb 21 23:50:53 2006 +0100
@@ -262,9 +262,9 @@
                 raise inst
             self.ui.warn(_("waiting for lock held by %s\n") % inst.args[0])
             try:
-                # default to 1024 seconds timeout
+                # default to 600 seconds timeout
                 l = lock.lock(self.join(lockname),
-                              int(self.ui.config("ui", "timeout") or 1024),
+                              int(self.ui.config("ui", "timeout") or 600),
                               releasefn)
             except lock.LockHeld, inst:
                 raise util.Abort(_("timeout while waiting for "