changeset 45000:3fadbdc47aed

merge with stable
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 25 Jun 2020 10:32:51 -0700
parents d1471dbbdd63 (current diff) 2fd8a8c11273 (diff)
children a25343d16ebe
files mercurial/utils/procutil.py
diffstat 2 files changed, 12 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/share.py	Wed Jun 24 23:17:56 2020 -0700
+++ b/hgext/share.py	Thu Jun 25 10:32:51 2020 -0700
@@ -5,6 +5,15 @@
 
 '''share a common history between several working directories
 
+The share extension introduces a new command :hg:`share` to create a new
+working directory. This is similar to :hg:`clone`, but doesn't involve
+copying or linking the storage of the repository. This allows working on
+different branches or changes in parallel without the associated cost in
+terms of disk space.
+
+Note: destructive operations or extensions like :hg:`rollback` should be
+used with care as they can result in confusing problems.
+
 Automatic Pooled Storage for Clones
 -----------------------------------
 
--- a/mercurial/utils/procutil.py	Wed Jun 24 23:17:56 2020 -0700
+++ b/mercurial/utils/procutil.py	Thu Jun 25 10:32:51 2020 -0700
@@ -635,7 +635,9 @@
                     def _do_wait():
                         os.waitpid(pid, 0)
 
-                    threading.Thread(target=_do_wait, daemon=True).start()
+                    t = threading.Thread(target=_do_wait)
+                    t.daemon = True
+                    t.start()
                     return
                 # Parent process
                 (_pid, status) = os.waitpid(pid, 0)