Mercurial > hg
view tests/histedit-helpers.sh @ 48278:fd3d4b7f8e62
tests: fix test-convert-git to work w/ "git pull" requiring strategy
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.
Differential Revision: https://phab.mercurial-scm.org/D11714
author | Kyle Lippincott <spectral@google.com> |
---|---|
date | Tue, 19 Oct 2021 18:06:07 -0700 |
parents | 890273343170 |
children |
line wrap: on
line source
fixbundle() { grep -v 'saving bundle' | grep -v 'saved backup' | \ grep -v added | grep -v adding | \ grep -v "unable to find 'e' for patching" | \ grep -v "e: No such file or directory" | \ cat }