annotate tests/test-check-setup-manifest.t @ 3809:f06ff8fee2f6

evolvestate: store info about relocation while resolving content-divergence While resolving content-divergence when they are on different parents, we relocate one of the node to parent of another one and this can lead to conflicts sometimes. So we need to store information about that state in evolvestate so that we can use that when user does `hg evolve --continue` or `--stop` or `--abort`. Now that we make sure, we store the new other node in evolvestate, we fix the behavior of handling the relocated commit and merge the right changesets.
author Pulkit Goyal <7895pulkit@gmail.com>
date Thu, 07 Jun 2018 18:18:10 +0530
parents 39d84b395343
children f2139537c2be
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2116
39d84b395343 checks: add a test that check MANIFEST.in content
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
1 #require test-repo
39d84b395343 checks: add a test that check MANIFEST.in content
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
2
39d84b395343 checks: add a test that check MANIFEST.in content
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
3 $ checkcm() {
39d84b395343 checks: add a test that check MANIFEST.in content
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
4 > if ! (which check-manifest > /dev/null); then
39d84b395343 checks: add a test that check MANIFEST.in content
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
5 > echo skipped: missing tool: check-manifest;
39d84b395343 checks: add a test that check MANIFEST.in content
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
6 > exit 80;
39d84b395343 checks: add a test that check MANIFEST.in content
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
7 > fi;
39d84b395343 checks: add a test that check MANIFEST.in content
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
8 > };
39d84b395343 checks: add a test that check MANIFEST.in content
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
9 $ checkcm
39d84b395343 checks: add a test that check MANIFEST.in content
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
10 $ cat << EOF >> $HGRCPATH
39d84b395343 checks: add a test that check MANIFEST.in content
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
11 > [experimental]
39d84b395343 checks: add a test that check MANIFEST.in content
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
12 > evolution=all
39d84b395343 checks: add a test that check MANIFEST.in content
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
13 > EOF
39d84b395343 checks: add a test that check MANIFEST.in content
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
14
39d84b395343 checks: add a test that check MANIFEST.in content
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
15 Run check manifest:
39d84b395343 checks: add a test that check MANIFEST.in content
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
16
39d84b395343 checks: add a test that check MANIFEST.in content
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
17 $ cd $TESTDIR/..
39d84b395343 checks: add a test that check MANIFEST.in content
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
18 $ check-manifest
39d84b395343 checks: add a test that check MANIFEST.in content
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
19 lists of files in version control and sdist match