Patchwork D1933: repair: invalidate volatile sets after stripping

login
register
mail settings
Submitter phabricator
Date Jan. 22, 2018, 1 p.m.
Message ID <d2555c269916fdcb783206ea69c3f4fd@localhost.localdomain>
Download mbox | patch
Permalink /patch/27030/
State Not Applicable
Headers show

Comments

phabricator - Jan. 22, 2018, 1 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG128dd940bedc: repair: invalidate volatile sets after stripping (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D1933?vs=4974&id=4977

REVISION DETAIL
  https://phab.mercurial-scm.org/D1933

AFFECTED FILES
  mercurial/repair.py
  tests/test-histedit-obsolete.t
  tests/test-rebase-obsolete.t
  tests/test-single-head.t

CHANGE DETAILS




To: martinvonz, durin42, #hg-reviewers, yuja
Cc: mharbison72, quark, mercurial-devel

Patch

diff --git a/tests/test-single-head.t b/tests/test-single-head.t
--- a/tests/test-single-head.t
+++ b/tests/test-single-head.t
@@ -200,4 +200,5 @@ 
 
   $ hg strip --config extensions.strip= --rev 'desc("c_dH0")'
   saved backup bundle to $TESTTMP/client/.hg/strip-backup/fe47ea669cea-a41bf5a9-backup.hg
+  warning: ignoring unknown working parent 49003e504178!
 
diff --git a/tests/test-rebase-obsolete.t b/tests/test-rebase-obsolete.t
--- a/tests/test-rebase-obsolete.t
+++ b/tests/test-rebase-obsolete.t
@@ -772,6 +772,7 @@ 
   1 new orphan changesets
   $ hg --hidden strip -r 'desc(B1)'
   saved backup bundle to $TESTTMP/obsskip/.hg/strip-backup/86f6414ccda7-b1c452ee-backup.hg
+  1 new orphan changesets
   $ hg log -G
   @  5:1a79b7535141 D
   |
diff --git a/tests/test-histedit-obsolete.t b/tests/test-histedit-obsolete.t
--- a/tests/test-histedit-obsolete.t
+++ b/tests/test-histedit-obsolete.t
@@ -71,6 +71,7 @@ 
   $ hg commit --amend -X . -m XXXXXX
   $ hg commit --amend -X . -m b2
   $ hg --hidden --config extensions.strip= strip 'desc(XXXXXX)' --no-backup
+  warning: ignoring unknown working parent aba7da937030!
   $ hg histedit --continue
   $ hg log -G
   @  8:273c1f3b8626 c
diff --git a/mercurial/repair.py b/mercurial/repair.py
--- a/mercurial/repair.py
+++ b/mercurial/repair.py
@@ -203,6 +203,7 @@ 
 
             deleteobsmarkers(repo.obsstore, stripobsidx)
             del repo.obsstore
+            repo.invalidatevolatilesets()
             repo._phasecache.filterunknown(repo)
 
         if tmpbundlefile: