Mercurial > evolve

annotate tests/testlib/obshistory_setup.sh @ 5776:453ba695c3d4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: add test for in-memory evolve, not actually in-memory yet The next patch will make `hg evolve` use in-memory merge. This patch adds a test case for that. I'm adding it before the implementation so it's easy to see what the behavior change is.
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 01 Oct 2020 12:34:36 -0700
parents 7c624b45fe60
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3885
3df8b6ecce2a tests: extract obshistory setup in a separate file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1 . $TESTDIR/testlib/common.sh
3df8b6ecce2a tests: extract obshistory setup in a separate file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
2
3df8b6ecce2a tests: extract obshistory setup in a separate file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
3 cat >> $HGRCPATH <<EOF
3df8b6ecce2a tests: extract obshistory setup in a separate file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
4 [ui]
3df8b6ecce2a tests: extract obshistory setup in a separate file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
5 interactive = true
3df8b6ecce2a tests: extract obshistory setup in a separate file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
6 [phases]
3df8b6ecce2a tests: extract obshistory setup in a separate file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
7 publish=False
3df8b6ecce2a tests: extract obshistory setup in a separate file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
8 [extensions]
3df8b6ecce2a tests: extract obshistory setup in a separate file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
9 evolve =
3df8b6ecce2a tests: extract obshistory setup in a separate file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
10 [experimental]
3df8b6ecce2a tests: extract obshistory setup in a separate file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
11 evolution.effect-flags = yes
3df8b6ecce2a tests: extract obshistory setup in a separate file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
12 EOF
3894
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3885
diff changeset
13
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3885
diff changeset
14 sync() {
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3885
diff changeset
15 hg pull -R $TESTTMP/server . -q
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3885
diff changeset
16 }