Mercurial > hg
annotate tests/test-pull-update.t @ 28180:2836a43c7722
run-tests: allow run-tests.py to run tests outside current directory
When reloading tests, run-tests.py was assuming that it could look
up the test by the basename, which only works if you are running
tests which are in the current directory.
This patch changes that lookup to use the full path. This is all
that was needed, and does not appear to cause any problems for
any of the existing testing work flows based on running the
suggested commands at the top of run-tests.py.
Motivation: In order to test Mercurial with Hypothesis (according
to https://www.mercurial-scm.org/wiki/HypothesisPlan) it is
useful to be able to generate temporary test files and execute
them. Generating temporary files in the tests/ directory leads to
a lot of suboptimal clutter.
author | David R. MacIver <david@drmaciver.com> |
---|---|
date | Thu, 18 Feb 2016 08:52:15 +0000 |
parents | 6b1fc09c699a |
children | 9ac8955d8c45 |
rev | line source |
---|---|
12279 | 1 $ hg init t |
2 $ cd t | |
3 $ echo 1 > foo | |
4 $ hg ci -Am m | |
5 adding foo | |
6 | |
7 $ cd .. | |
8 $ hg clone t tt | |
9 updating to branch default | |
10 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
11 $ cd tt | |
12 $ echo 1.1 > foo | |
13 $ hg ci -Am m | |
5080
73fdc8bd3ed8
Update on pull -u when heads were closed (fixes issue666).
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
14 |
12279 | 15 $ cd ../t |
16 $ echo 1.2 > foo | |
17 $ hg ci -Am m | |
18 | |
28065
6b1fc09c699a
update: change default destination to tipmost descendant (issue4673) (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26968
diff
changeset
|
19 Should not update to the other topological branch: |
5080
73fdc8bd3ed8
Update on pull -u when heads were closed (fixes issue666).
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
20 |
12279 | 21 $ hg pull -u ../tt |
22 pulling from ../tt | |
23 searching for changes | |
24 adding changesets | |
25 adding manifests | |
26 adding file changes | |
27 added 1 changesets with 1 changes to 1 files (+1 heads) | |
28065
6b1fc09c699a
update: change default destination to tipmost descendant (issue4673) (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26968
diff
changeset
|
28 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6b1fc09c699a
update: change default destination to tipmost descendant (issue4673) (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26968
diff
changeset
|
29 1 other heads for branch "default" |
12279 | 30 |
31 $ cd ../tt | |
5080
73fdc8bd3ed8
Update on pull -u when heads were closed (fixes issue666).
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
32 |
28065
6b1fc09c699a
update: change default destination to tipmost descendant (issue4673) (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26968
diff
changeset
|
33 Should not update to the other branch: |
12279 | 34 |
35 $ hg pull -u ../t | |
36 pulling from ../t | |
37 searching for changes | |
38 adding changesets | |
39 adding manifests | |
40 adding file changes | |
41 added 1 changesets with 1 changes to 1 files (+1 heads) | |
28065
6b1fc09c699a
update: change default destination to tipmost descendant (issue4673) (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26968
diff
changeset
|
42 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6b1fc09c699a
update: change default destination to tipmost descendant (issue4673) (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26968
diff
changeset
|
43 1 other heads for branch "default" |
5080
73fdc8bd3ed8
Update on pull -u when heads were closed (fixes issue666).
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
44 |
12279 | 45 $ HGMERGE=true hg merge |
46 merging foo | |
47 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
48 (branch merge, don't forget to commit) | |
49 $ hg ci -mm | |
50 | |
51 $ cd ../t | |
52 | |
53 Should work: | |
5080
73fdc8bd3ed8
Update on pull -u when heads were closed (fixes issue666).
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
54 |
12279 | 55 $ hg pull -u ../tt |
56 pulling from ../tt | |
57 searching for changes | |
58 adding changesets | |
59 adding manifests | |
60 adding file changes | |
61 added 1 changesets with 1 changes to 1 files (-1 heads) | |
62 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
63 | |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
14485
diff
changeset
|
64 $ cd .. |