Re: [Python-Dev] git history conundrum

2019-04-28 Thread Robert Collins
Share your own username with Michael or I and we'll add you there. Rob On Mon, 29 Apr 2019, 09:55 Chris Withers, wrote: > On 28/04/2019 22:21, Robert Collins wrote: > > Thank you! > > Thank me when we get there ;-) Currently in Dec 2018 with a wonderful > Py2 failure: > >

Re: [Python-Dev] git history conundrum

2019-04-28 Thread Michael Foord
> On 28 Apr 2019, at 22:55, Chris Withers wrote: > >> On 28/04/2019 22:21, Robert Collins wrote: >> Thank you! > > Thank me when we get there ;-) Currently in Dec 2018 with a wonderful Py2 > failure: > > == > ERROR:

Re: [Python-Dev] git history conundrum

2019-04-28 Thread Chris Withers
On 28/04/2019 22:21, Robert Collins wrote: Thank you! Thank me when we get there ;-) Currently in Dec 2018 with a wonderful Py2 failure: == ERROR: test_autospec_getattr_partial_function

Re: [Python-Dev] git history conundrum

2019-04-28 Thread Robert Collins
Thank you! If I understand correctly this is just the hg style branch backport consequence, multiple copies of a change. Should be safe to skip those. Rob On Sun, 28 Apr 2019, 07:11 Chris Withers, wrote: > Hi All, > > I'm in the process of bringing the mock backport up to date, but this > has

Re: [Python-Dev] git history conundrum

2019-04-28 Thread Antoine Pitrou
On Sun, 28 Apr 2019 08:25:30 +0100 Chris Withers wrote: > > What's the best way to spell "show me all the revisions on master that > affect {mock files} from commit x to HEAD, not including x"? Something like: $ git log x...HEAD -- {mock files} perhaps? Regards Antoine.

Re: [Python-Dev] git history conundrum

2019-04-28 Thread Chris Withers
On 28/04/2019 03:51, Martin Panter wrote: On Sat, 27 Apr 2019 at 19:07, Chris Withers wrote: Right, so I've merged up to 15f44ab043, what comes next? $ git log --oneline --no-merges 15f44ab043.. -- Lib/unittest/mock.py Lib/unittest/test/testmock/ | tail -n 3 This Git command line means

Re: [Python-Dev] git history conundrum

2019-04-28 Thread Chris Withers
On 28/04/2019 03:51, Martin Panter wrote: On Sat, 27 Apr 2019 at 19:07, Chris Withers wrote: Right, so I've merged up to 15f44ab043, what comes next? $ git log --oneline --no-merges 15f44ab043.. -- Lib/unittest/mock.py Lib/unittest/test/testmock/ | tail -n 3 This Git command line means list

Re: [Python-Dev] git history conundrum

2019-04-27 Thread Martin Panter
On Sat, 27 Apr 2019 at 19:07, Chris Withers wrote: > Right, so I've merged up to 15f44ab043, what comes next? > > $ git log --oneline --no-merges 15f44ab043.. -- Lib/unittest/mock.py > Lib/unittest/test/testmock/ | tail -n 3 This Git command line means list all the revisions except 15f44ab043

[Python-Dev] git history conundrum

2019-04-27 Thread Chris Withers
Hi All, I'm in the process of bringing the mock backport up to date, but this has got me stumped: $ git log --onelineĀ  --no-merges 5943ea76d529f9ea18c73a61e10c6f53bdcc864f.. -- Lib/unittest/mock.py Lib/unittest/test/testmock/ | tail 362f058a89 Issue #28735: Fixed the comparison of