- User Since
- Jun 28 2017, 5:28 PM (158 w, 2 d)
Could you include in the commit message which commit added the code and which commit made it unnecessary? "the previous patch/commit" is an okay way of saying that , IMO, even though it requires the reviewer to queue the two patches right after each other for the description to make sense.
Should we have an entry in the release notes about this or have we given up on documenting API changes? I'm fine with either, as long as we have some policy.
Wed, Jul 8
Mon, Jun 29
Thu, Jun 25
Reminder that this is intended for stable (since that's where the py3-only fix is)
Tue, Jun 23
Mon, Jun 22
We have not made this change before because there is no hg update --abort. Do we have that feature yet (I haven't followed all the changes recently)?
Thu, Jun 11
Jun 10 2020
Worth mentioning in relnotes? (This has been queued, so that would be a followup.)
Jun 9 2020
Jun 8 2020
Jun 5 2020
Jun 4 2020
May 30 2020
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).
May 29 2020
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.
May 26 2020
May 19 2020
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?
May 18 2020
May 16 2020
May 12 2020
Thanks for the quick fix and the added test case!