Mon, 20 May 2019 14:00:12 -0400 absorb: fix interactive mode I didn't know existed
Augie Fackler <augie@google.com> [Mon, 20 May 2019 14:00:12 -0400] rev 42373
absorb: fix interactive mode I didn't know existed While investigating a bug in `hg absorb -e` I unintentionally discovered `hg absorb --interactive` and its brokenness. This adds a test and restores the functionality. Note that this interface is still marked experimental, so we can change this to be more sophisticated in the future. Differential Revision: https://phab.mercurial-scm.org/D6411
Fri, 17 May 2019 11:13:12 -0400 tests: work around libressl being different about error strings (issue6122)
Augie Fackler <augie@google.com> [Fri, 17 May 2019 11:13:12 -0400] rev 42372
tests: work around libressl being different about error strings (issue6122) As far as I can tell, this is the right behavior. Thanks to Alex Gaynor for checking what the string means by looking at libressl sources for me. Differential Revision: https://phab.mercurial-scm.org/D6410
Mon, 20 May 2019 11:40:47 -0400 merge with stable
Augie Fackler <augie@google.com> [Mon, 20 May 2019 11:40:47 -0400] rev 42371
merge with stable
(0) -30000 -10000 -3000 -1000 -300 -100 -30 -10 -3 +3 +10 +30 +100 +300 +1000 +3000 tip