D7521: amend: check for file modifications when updating dirstate (issue6233)

spectral (Kyle Lippincott) phabricator at mercurial-scm.org
Mon Dec 2 13:43:08 EST 2019


spectral added inline comments.
spectral marked an inline comment as done.

INLINE COMMENTS

> mharbison72 wrote in test-amend.t:493
> This whole test needs to be wrapped in `#if exebit` to keep Windows happy.

Replaced this with what other tests do: call sh directly (example: test-rebase-collapse.t, L37).

> test-amend.t:496
> +  $ sleep 3
> +  $ if (hg diff -c . | grep 'delta' >/dev/null) || [[ -n "$(hg status)" ]]; then
> +  >   echo "OK."

Also had to actually amend to include this fix, I'd left it in my working directory. Oops.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7521/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7521

To: spectral, #hg-reviewers, mharbison72
Cc: mharbison72, mercurial-devel


More information about the Mercurial-devel mailing list