Mercurial Mercurial > pub > hg > evolve / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/testlib/topic_setup.sh
author Pierre-Yves David <pierre-yves.david@octobus.net>
Sun, 24 Mar 2019 21:30:12 +0530
changeset 4444 ea336a6592cc
parent 2828 fa2deeb5dd03
permissions -rw-r--r--
evolve: test a common case of public divergence evolve: in pubdiv, handle the case when public branch is behind the mutable In public divergence, when public branch is behind the mutable one the behaviour that this patch added is that we relocate the draft one to public side. This should be fine in most case, but might be an issue in some other (eg, when the draft side of the divergence is rebase away from ancestors it relies on.) Test written by Pierre-Yves David <pierre-yves.david@octobus.net>
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1839
1bc5e62fc0c7 Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff changeset 
     1
 
#!/bin/sh
2828
fa2deeb5dd03 test: setup python path for topic tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2045
diff changeset 
     2
 
. $TESTDIR/testlib/pythonpath.sh
1839
1bc5e62fc0c7 Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff changeset 
     3
 












1bc5e62fc0c7
Initial dumb version of topics.



Augie Fackler <augie@google.com>


parents: 

diff
changeset




     4


# This file holds logic that is used in many tests.












1bc5e62fc0c7
Initial dumb version of topics.



Augie Fackler <augie@google.com>


parents: 

diff
changeset




     5


# It can be called in a test like this:







2045






db617700d318
tests: move "test setup" script into a 'testlib' directory



Pierre-Yves David <pierre-yves.david@ens-lyon.org>


parents: 
1901

diff
changeset




     6


#  $ . "$TESTDIR/testlib/topic_setup.sh"







1839






1bc5e62fc0c7
Initial dumb version of topics.



Augie Fackler <augie@google.com>


parents: 

diff
changeset




     7









1840






2321fd2ed56e
testlib: enable rebase and obsolete for easier testing



Augie Fackler <augie@google.com>


parents: 
1839

diff
changeset




     8


# Enable obsolete markers and enable extensions












2321fd2ed56e
testlib: enable rebase and obsolete for easier testing



Augie Fackler <augie@google.com>


parents: 
1839

diff
changeset




     9


cat >> $HGRCPATH << EOF












2321fd2ed56e
testlib: enable rebase and obsolete for easier testing



Augie Fackler <augie@google.com>


parents: 
1839

diff
changeset




    10


[experimental]












2321fd2ed56e
testlib: enable rebase and obsolete for easier testing



Augie Fackler <augie@google.com>


parents: 
1839

diff
changeset




    11


evolution=createmarkers,exchange












2321fd2ed56e
testlib: enable rebase and obsolete for easier testing



Augie Fackler <augie@google.com>


parents: 
1839

diff
changeset




    12














2321fd2ed56e
testlib: enable rebase and obsolete for easier testing



Augie Fackler <augie@google.com>


parents: 
1839

diff
changeset




    13


[extensions]












2321fd2ed56e
testlib: enable rebase and obsolete for easier testing



Augie Fackler <augie@google.com>


parents: 
1839

diff
changeset




    14


rebase=







2828






fa2deeb5dd03
test: setup python path for topic tests



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
2045

diff
changeset




    15


topic=







1840






2321fd2ed56e
testlib: enable rebase and obsolete for easier testing



Augie Fackler <augie@google.com>


parents: 
1839

diff
changeset




    16


EOF














evolve