tests/testlib/obshistory_setup.sh
author Martin von Zweigbergk <martinvonz@google.com>
Tue, 19 Nov 2019 14:24:31 -0800 (2019-11-19)
changeset 5010 effce0a1f5bd
parent 3894 7c624b45fe60
permissions -rw-r--r--
tests: demonstrate how evolve loses transitive copies when interrupted Let's say `b` has been renamed to `c` in commit A and then renamed to `d` in commit B. We now modify A in a way that will cause a conflict when we evolve B. `hg evolve` will now stop and let the user resolve the conflicts, but it will have lost the copy information in the working copy (should still be c->d).
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
}