Mercurial > hg-stable
view tests/test-check-cargo-lock.t @ 45874:781b09790633
tests: show that interactive shelve can leave the repo with a merge state
If part of a file is shelved (as we already do in a test), there will
be an unfinished merge state left after `hg shelve` finishes. There
should never be a merge conflict and there should never be a reason
that the user would like to re-resolve conflicts, so we should clear
that state (see next patch).
Differential Revision: https://phab.mercurial-scm.org/D9334
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 16 Nov 2020 22:38:36 -0800 |
parents | ba0d93a5f06f |
children |
line wrap: on
line source
#require cargo test-repo $ . "$TESTDIR/helpers-testrepo.sh" $ cd "$TESTDIR"/../rust Check if Cargo.lock is up-to-date. Will fail with a 101 error code if not. $ cargo check --locked --all --quiet However most CIs will run `cargo build` or similar before running the tests, so we need to check if it was modified $ testrepohg diff Cargo.lock