Mercurial > evolve

annotate tests/testlib/content-divergence-util.sh @ 5906:55b7e6523559 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added tag 10.3.1 for changeset 93dc3cb68842
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sun, 25 Apr 2021 15:32:51 +0200
parents 3216855846dd
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5388
af210e6293c5 evolve: add setup utility for testing content-divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
1 #!/bin/sh
af210e6293c5 evolve: add setup utility for testing content-divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
2 # setup config and various utility to test content-divergence resolution
af210e6293c5 evolve: add setup utility for testing content-divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
3
af210e6293c5 evolve: add setup utility for testing content-divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
4 . $TESTDIR/testlib/common.sh
af210e6293c5 evolve: add setup utility for testing content-divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
5
af210e6293c5 evolve: add setup utility for testing content-divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
6 cat >> $HGRCPATH <<EOF
af210e6293c5 evolve: add setup utility for testing content-divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
7 [ui]
af210e6293c5 evolve: add setup utility for testing content-divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
8 # simpler log output
af210e6293c5 evolve: add setup utility for testing content-divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
9 logtemplate ="{rev}:{node|short} ({phase}): {desc|firstline} {if(troubles, '[{troubles}]')}\n"
af210e6293c5 evolve: add setup utility for testing content-divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
10
af210e6293c5 evolve: add setup utility for testing content-divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
11 [phases]
af210e6293c5 evolve: add setup utility for testing content-divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
12 # non publishing server
af210e6293c5 evolve: add setup utility for testing content-divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
13 publish=False
af210e6293c5 evolve: add setup utility for testing content-divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
14
af210e6293c5 evolve: add setup utility for testing content-divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
15 [extensions]
af210e6293c5 evolve: add setup utility for testing content-divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
16 evolve=
5390
3216855846dd evolve: add test coverage for content-div case A2
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5388
diff changeset
17 rebase=
5388
af210e6293c5 evolve: add setup utility for testing content-divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
18 EOF
af210e6293c5 evolve: add setup utility for testing content-divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
19
af210e6293c5 evolve: add setup utility for testing content-divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
20 setuprepos() {
af210e6293c5 evolve: add setup utility for testing content-divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
21 echo creating test repo for test case $1
af210e6293c5 evolve: add setup utility for testing content-divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
22 mkdir $1
af210e6293c5 evolve: add setup utility for testing content-divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
23 cd $1
af210e6293c5 evolve: add setup utility for testing content-divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
24
af210e6293c5 evolve: add setup utility for testing content-divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
25 echo - upstream
af210e6293c5 evolve: add setup utility for testing content-divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
26 hg init upstream
af210e6293c5 evolve: add setup utility for testing content-divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
27 cd upstream
af210e6293c5 evolve: add setup utility for testing content-divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
28 mkcommit O
af210e6293c5 evolve: add setup utility for testing content-divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
29 hg phase --public .
af210e6293c5 evolve: add setup utility for testing content-divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
30 cd ..
af210e6293c5 evolve: add setup utility for testing content-divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
31 echo - local
af210e6293c5 evolve: add setup utility for testing content-divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
32 hg clone -q upstream local
af210e6293c5 evolve: add setup utility for testing content-divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
33 echo - other
af210e6293c5 evolve: add setup utility for testing content-divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
34 hg clone -q upstream other
af210e6293c5 evolve: add setup utility for testing content-divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
35 echo 'cd into `local` and proceed with env setup'
af210e6293c5 evolve: add setup utility for testing content-divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
36 }