https://bz.mercurial-scm.org/show_bug.cgi?id=6147
Bug ID: 6147 Summary: Rebase makes a mess when rebasing over upstream changes Product: Mercurial Version: 4.9 Hardware: PC OS: Linux Status: UNCONFIRMED Severity: feature Priority: wish Component: rebase Assignee: bugzi...@mercurial-scm.org Reporter: sph...@gmail.com CC: mercurial-devel@mercurial-scm.org I have a stack of 13 draft patches on top of a public revision b37b6c015168. I pull from upstream, get a bunch of new changesets, the top one is 1adf382a3e65. The first 8 patches in my stack have landed upstream, so I'm hoping to discard those in favor of their public versions. I rebase my stack on top of the new patch: ``` % hg rebase -d 1adf382a3e65 ``` (I was updated to the tip of my patch stack.) I do a bunch of manual merging, then when the rebase is complete it says ``` 12 new orphan changesets ``` Uh oh. I have a detailed log of various things at https://gist.github.com/hotsphink/a0179e2d4276c454b376b5805a3708aa but I think the core of the problem can be seen with: ``` % hg lg -r '693db7f7e53d+c5021e44f9ad+c02c313df219+ccce79792b68+ee9f7a9a7530+b37b6c015168+parents(.)' * 693db7f7e53d Write log of weakmap mark activity when crashing due to assert weakmap.incremental |\ @ : c5021e44f9ad Bug 1167452 - Add a currentgc() function that returns lots of info on the internal incremental GC state. r=jonco weakmap.incremental graveyard.unmarkgray |\: * : c02c313df219 Bug 1167452 - Unbarrier lookup for delete r=jonco weakmap.incremental weak.inc.compartmental |\ \ +---x ccce79792b68 Bug 1167452 - Add a currentgc() function that returns lots of info on the internal incremental GC state. r=jonco weakmap.incremental x : ee9f7a9a7530 Bug 1167452 - Unbarrier lookup for delete r=jonco weakmap.incremental :/ o b37b6c015168 Bug 1395509 - Add an alloc policy that tracks malloc memory associated with GC things r=sfink ``` Why is the working directory a merge? ``` % hg --version Mercurial Distributed SCM (version 4.9+396-88d4477ac4f6) ``` -- You are receiving this mail because: You are on the CC list for the bug. _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel