- User Since
- Jun 28 2017, 5:28 PM (153 w, 1 d)
Sat, May 30
Maybe another option is to allow multiple -d arguments for this case? Something like hg rebase -r C -d B -d D. I haven't thought through BC, but I think that's what I'd prefer if we were writing rebase from scratch. I know we can't support hg rebase -r C -d 'B + D' for backward-compatibility reasons (because we already support that -- it rebases to the highest revnum in the set).
Fri, May 29
This is not meant for review; I'm sending it now in case it'll be useful for @durin42's work on merge-diffs. I also included the rest of the stack to explain why I wrote the code.
Tue, May 26
Tue, May 19
It looks like the latter two hunks in this file will need to be able to read the merge state from an overlayworkingctx. Maybe that's coming in a later patch, but I think it would be easier to follow if this code was changed only then (very much related to my comment on an earlier patch).
I think I'd prefer to leave code that doesn't use overlayworkingctx unchanged. I don't see any reason to get the merge state from the context if we know that the context is a regular workingctx.
Also update the release notes to mention the API change?
Mon, May 18
Sat, May 16
Tue, May 12
Thanks for the quick fix and the added test case!
Mention API change in relnotes/next?
Mon, May 11
Fri, May 8
Looking forward to using this!
Thu, May 7
Wed, May 6
May 1 2020
Apr 30 2020
I'm queuing this series. Thanks for all your work on packaging!
Why do we even give the choice between 3.7 and 3.8? Just because it was easy to do so anyway? Since the Python runtime is embedded, there's very little reason to try to match a system Python or something, right? To be clear, I don't have an issue with allowing it; I was just surprised by it and wanted to make sure I understand it correctly.
Apr 23 2020
Apr 22 2020
I thought I already had abandoned this, but apparently not :)
Apr 21 2020
Apr 20 2020
Apr 13 2020
What was broken before? The test case still seems to pass for me if I undo the code change.
Apr 10 2020
Apr 7 2020
Apr 3 2020
Apr 2 2020
This one is trivial to move ahead of the other two patches so I'll queue it and fix any conflicts in flight.
Apr 1 2020
Heads up that we ran into a fun bug that was probably caused by this patch. I think what happened was this: