[Commented On] D8567: mergestate: implement trivial in-memory mergestate

[durin42 (Augie Fackler)]

durin42 added a comment.


  This is now much closer! I'm down to a handful of failures, all like this:
  
    --- tests/test-copies-in-changeset.t
    +++ hgtest/tests/test-copies-in-changeset.t#sidedata.err
    @@ -358,6 +358,8 @@
       $ hg ci -qm 'rename a to b'
       $ hg rebase -d 1 --config rebase.experimental.inmemory=yes
       rebasing 2:* "rename a to b" (tip) (glob)
    +  hit merge conflicts; re-running rebase without in-memory merge
    +  rebasing 2:b977edf6f839 "rename a to b" (tip)
       merging a and b to b
       saved backup bundle to $TESTTMP/rebase-rename/.hg/strip-backup/*-*-rebase.hg (glob)
       $ hg st --change . --copies
    
    ERROR: test-copies-in-changeset.t#sidedata output changed
    --- tests/test-rebase-inmemory.t
    +++ tests/test-rebase-inmemory.t.err
    @@ -780,6 +780,8 @@
       $ hg ci -qm 'rename a to b'
       $ hg rebase -d 1
       rebasing 2:b977edf6f839 "rename a to b" (tip)
    +  hit merge conflicts; re-running rebase without in-memory merge
    +  rebasing 2:b977edf6f839 "rename a to b" (tip)
       merging a and b to b
       saved backup bundle to $TESTTMP/rebase-rename/.hg/strip-backup/b977edf6f839-0864f570-rebase.hg
       $ hg st --copies --change .
    @@ -801,6 +803,8 @@
       $ hg ci -qm 'rename a to b'
       $ hg rebase -d 1
       rebasing 2:b977edf6f839 "rename a to b" (tip)
    +  hit merge conflicts; re-running rebase without in-memory merge
    +  rebasing 2:b977edf6f839 "rename a to b" (tip)
       merging a and b to b
       saved backup bundle to $TESTTMP/rebase-rename-empty/.hg/strip-backup/b977edf6f839-0864f570-rebase.hg
       $ hg st --copies --change .
    @@ -820,6 +824,8 @@
       $ echo a2 > a
       $ hg ci -qm 'modify a'
       $ hg rebase -r . -d 1 --collapse
    +  rebasing 2:41c4ea50d4cf "modify a" (tip)
    +  hit merge conflicts; re-running rebase without in-memory merge
       rebasing 2:41c4ea50d4cf "modify a" (tip)
       merging b and a to b
       saved backup bundle to $TESTTMP/rebase-rename-collapse/.hg/strip-backup/41c4ea50d4cf-b90b7994-rebase.hg
    
    ERROR: test-rebase-inmemory.t output changed
  
  Clearly I'm tickling some merge logic that previously went unused in the IMM case, and it'll take some investigating, but I suspect that long-term this will let us run more merges in-memory without having to revert to on-disk merge logic.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D8567/new/

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

To: durin42, #hg-reviewers
Cc: martinvonz, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20200528/3f572085/attachment-0002.html>