Patchwork D1679: rebase: fix for hgsubversion

login
register
mail settings
Submitter phabricator
Date Dec. 14, 2017, 12:30 p.m.
Message ID <52aadf313e86569c473c8a67c1e9ed26@localhost.localdomain>
Download mbox | patch
Permalink /patch/26275/
State Not Applicable
Headers show

Comments

phabricator - Dec. 14, 2017, 12:30 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG83014fa95435: rebase: fix for hgsubversion (authored by phillco, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D1679?vs=4415&id=4428

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

AFFECTED FILES
  hgext/rebase.py

CHANGE DETAILS




To: phillco, #hg-reviewers, yuja
Cc: yuja, mercurial-devel

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -1102,13 +1102,14 @@ 
     if wctx.isinmemory():
         wctx.setbase(repo[p1])
     else:
-        # This is necessary to invalidate workingctx's caches.
-        wctx = repo[None]
         if repo['.'].rev() != p1:
             repo.ui.debug(" update to %d:%s\n" % (p1, repo[p1]))
             mergemod.update(repo, p1, False, True)
         else:
             repo.ui.debug(" already in destination\n")
+        # This is, alas, necessary to invalidate workingctx's manifest cache,
+        # as well as other data we litter on it in other places.
+        wctx = repo[None]
         repo.dirstate.write(repo.currenttransaction())
     repo.ui.debug(" merge against %d:%s\n" % (rev, repo[rev]))
     if base is not None: