Mercurial > evolve
annotate tests/test-version-install.t @ 6224:17ffdea0edbb stable
evolve: look for split successors of the correct ancestor (issue6648)
Consider two changesets, 1 and 2. 1 is split into two new changesets and 2 is
pruned. If we stand on 2 and call hg evolve, _singlesuccessor() will traverse
ancestors of wdp in search of a changeset with successors to update to (it will
be 1, which was split). In case of a split, select_split_successor() gets
control. The issue is this function didn't traverse ancestors, and instead
tried to look up successors of the original changeset (i.e. 2 in our case,
which was pruned).
We can make select_split_successor() aware of _singlesuccessor() logic by using
the changeset that actually has successors without traversing ancestors again.
It's done by storing that changeset in MultipleSuccessorsError exception.
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Thu, 21 Apr 2022 22:19:27 +0400 |
parents | 44c20093fc0e |
children | f0a052aa924d |
rev | line source |
---|---|
4875
164543ac3277
setup: add a test for running setup.py
Ian Moody <moz-ian@perix.co.uk>
parents:
diff
changeset
|
1 $ cat >> $HGRCPATH <<EOF |
164543ac3277
setup: add a test for running setup.py
Ian Moody <moz-ian@perix.co.uk>
parents:
diff
changeset
|
2 > [extensions] |
164543ac3277
setup: add a test for running setup.py
Ian Moody <moz-ian@perix.co.uk>
parents:
diff
changeset
|
3 > EOF |
164543ac3277
setup: add a test for running setup.py
Ian Moody <moz-ian@perix.co.uk>
parents:
diff
changeset
|
4 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH |
164543ac3277
setup: add a test for running setup.py
Ian Moody <moz-ian@perix.co.uk>
parents:
diff
changeset
|
5 |
164543ac3277
setup: add a test for running setup.py
Ian Moody <moz-ian@perix.co.uk>
parents:
diff
changeset
|
6 Test outputting version number |
164543ac3277
setup: add a test for running setup.py
Ian Moody <moz-ian@perix.co.uk>
parents:
diff
changeset
|
7 |
164543ac3277
setup: add a test for running setup.py
Ian Moody <moz-ian@perix.co.uk>
parents:
diff
changeset
|
8 $ hg version -v |
164543ac3277
setup: add a test for running setup.py
Ian Moody <moz-ian@perix.co.uk>
parents:
diff
changeset
|
9 Mercurial Distributed SCM (version *) (glob) |
164543ac3277
setup: add a test for running setup.py
Ian Moody <moz-ian@perix.co.uk>
parents:
diff
changeset
|
10 (see https://mercurial-scm.org for more information) |
164543ac3277
setup: add a test for running setup.py
Ian Moody <moz-ian@perix.co.uk>
parents:
diff
changeset
|
11 |
5877
44c20093fc0e
tests: more globbing on the copyright line
Anton Shestakov <av6@dwimlabs.net>
parents:
4878
diff
changeset
|
12 Copyright (C) 2005-* (glob) |
4875
164543ac3277
setup: add a test for running setup.py
Ian Moody <moz-ian@perix.co.uk>
parents:
diff
changeset
|
13 This is free software; see the source for copying conditions. There is NO |
164543ac3277
setup: add a test for running setup.py
Ian Moody <moz-ian@perix.co.uk>
parents:
diff
changeset
|
14 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
164543ac3277
setup: add a test for running setup.py
Ian Moody <moz-ian@perix.co.uk>
parents:
diff
changeset
|
15 |
164543ac3277
setup: add a test for running setup.py
Ian Moody <moz-ian@perix.co.uk>
parents:
diff
changeset
|
16 Enabled extensions: |
164543ac3277
setup: add a test for running setup.py
Ian Moody <moz-ian@perix.co.uk>
parents:
diff
changeset
|
17 |
164543ac3277
setup: add a test for running setup.py
Ian Moody <moz-ian@perix.co.uk>
parents:
diff
changeset
|
18 evolve external * (glob) |
164543ac3277
setup: add a test for running setup.py
Ian Moody <moz-ian@perix.co.uk>
parents:
diff
changeset
|
19 |
164543ac3277
setup: add a test for running setup.py
Ian Moody <moz-ian@perix.co.uk>
parents:
diff
changeset
|
20 Test install |
4877
77e5c733200a
py3: remove smartquotes from README
Ian Moody <moz-ian@perix.co.uk>
parents:
4876
diff
changeset
|
21 TODO: fix warning |
4875
164543ac3277
setup: add a test for running setup.py
Ian Moody <moz-ian@perix.co.uk>
parents:
diff
changeset
|
22 $ "$PYTHON" "$TESTDIR/../setup.py" install --root "$TESTTMP/installtest" > /dev/null |
4877
77e5c733200a
py3: remove smartquotes from README
Ian Moody <moz-ian@perix.co.uk>
parents:
4876
diff
changeset
|
23 */distutils/dist.py:*: UserWarning: Unknown distribution option: 'python_requires' (glob) |
77e5c733200a
py3: remove smartquotes from README
Ian Moody <moz-ian@perix.co.uk>
parents:
4876
diff
changeset
|
24 warnings.warn(msg) |