# HG changeset patch # User Boris Feld # Date 2019-01-02 03:57:47 # Node ID e80329a3952c9c6db63838d2fa50b534f941fcb2 # Parent cfd95219102de1579cbb22e813d714c004454c9a strip: clarify comment around bundle create We may create two bundles, one for the changeset actually stripped, and one for the changeset affected by the strip we want to keep. (Changesets with a higher rev number than the striped ones). For soft stripping, we still need to the first one (used for "restoring" the changesets), but not the second one. We start with clarifying which bits of the code is used for what. diff --git a/mercurial/repair.py b/mercurial/repair.py --- a/mercurial/repair.py +++ b/mercurial/repair.py @@ -168,7 +168,7 @@ def strip(ui, repo, nodelist, backup=Tru if rev in tostrip: updatebm.append(m) - # create a changegroup for all the branches we need to keep + # backup the changeset we are about to strip backupfile = None node = nodelist[-1] if backup: @@ -177,6 +177,7 @@ def strip(ui, repo, nodelist, backup=Tru vfs.join(backupfile)) repo.ui.log("backupbundle", "saved backup bundle to %s\n", vfs.join(backupfile)) + # create a changegroup for all the branches we need to keep tmpbundlefile = None if saveheads: # do not compress temporary bundle if we remove it from disk later