This is an archive of the discontinued Mercurial Phabricator instance.

tests: fix test-convert-git to work w/ "git pull" requiring strategy

Authored by spectral on Oct 20 2021, 1:55 PM.



A recent change to git (031e2f7ae195) made it an error to not specify a strategy
(--rebase, --no-rebase, --ff-only), instead of just the warning it was
previously. As far as I can tell, --no-rebase is the behavior we were getting
before, and the only one that makes the test work.

Diff Detail

rHG Mercurial
Automatic diff as part of commit; lint not applicable.
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

spectral created this revision.Oct 20 2021, 1:55 PM
Alphare accepted this revision.Oct 22 2021, 3:25 AM
This revision is now accepted and ready to land.Oct 22 2021, 3:25 AM