[Python-Dev] git history conundrum (original) (raw)
Chris Withers chris at withers.org
Sat Apr 27 13:30:10 EDT 2019
- Previous message (by thread): [Python-Dev] datetime.fromisocalendar
- Next message (by thread): [Python-Dev] git history conundrum
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
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 mock.MagickMock with mock.ANY. d9c956fb23 Issue #20804: The unittest.mock.sentinel attributes now preserve their identity when they are copied or pickled. 84b6fb0eea Fix unittest.mock._Call: don't ignore name 161a4dd495 Issue #28919: Simplify _copy_func_details() in unittest.mock ac5084b6c7 Fixes issue28380: unittest.mock Mock autospec functions now properly support assert_called, assert_not_called, and assert_called_once. 0be894b2f6 Issue #27895: Spelling fixes (Contributed by Ville Skyttä). 15f44ab043 Issue #27895: Spelling fixes (Contributed by Ville Skyttä). d4583d7fea Issue #26750: use inspect.isdatadescriptor instead of our own _is_data_descriptor(). 9854789efe Issue #26750: unittest.mock.create_autospec() now works properly for subclasses of property() and other data descriptors. 204bf0b9ae English spelling and grammar fixes
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 161a4dd495 Issue #28919: Simplify _copy_func_details() in unittest.mock ac5084b6c7 Fixes issue28380: unittest.mock Mock autospec functions now properly support assert_called, assert_not_called, and assert_called_once. 0be894b2f6 Issue #27895: Spelling fixes (Contributed by Ville Skyttä).
Okay, no idea why 0be894b2f6 is there, appears to be a totally identical commit to 15f44ab043, so let's skip it:
$ git log --oneline --no-merges 0be894b2f6.. -- Lib/unittest/mock.py Lib/unittest/test/testmock/ | tail -n 3 161a4dd495 Issue #28919: Simplify _copy_func_details() in unittest.mock ac5084b6c7 Fixes issue28380: unittest.mock Mock autospec functions now properly support assert_called, assert_not_called, and assert_called_once. 15f44ab043 Issue #27895: Spelling fixes (Contributed by Ville Skyttä).
Wat?! Why is 15f44ab043 showing up again?!
What's the git subtlety I'm missing here?
Chris
- Previous message (by thread): [Python-Dev] datetime.fromisocalendar
- Next message (by thread): [Python-Dev] git history conundrum
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]