Mercurial > hg
annotate tests/test-issue1102.t @ 44667:b561f3a68e41 stable
discovery: avoid wrongly saying there are nothing to pull
We can get in a situation where a revision passed through `hg pull --rev REV`
are available on the server, but not a descendant of the advertised server
heads.
For example the server could lying be during heads advertisement, to hide some
pull request. Or obsolete/hidden content could be explicitly pulled.
So in this case the lookup associated to `REV` returned successfully, but the
normal discovery will find all advertised heads already known locally. This flip
a special boolean `anyinc` that will prevent any fetch attempt, preventing `REV`
to be pulled over.
We add three line of code to detect this case and make sure a pull actually
happens.
My main target is to make some third party extensions happy (I expect the
associated test to move upstream with the extension). However this fix already
make some of the `infinitepush` test happier.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Mon, 06 Apr 2020 00:24:57 +0200 |
parents | 4591cd6b6794 |
children | 805419729e11 |
rev | line source |
---|---|
11847 | 1 $ rm -rf a |
2 $ hg init a | |
3 $ cd a | |
4 $ echo a > a | |
5 $ hg ci -Am0 | |
6 adding a | |
7 $ hg tag t1 # 1 | |
8 $ hg tag --remove t1 # 2 | |
6671
938eddd76237
tag: record tag we're superseding, if any (issue 1102)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
9 |
11847 | 10 $ hg co 1 |
11 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
13135
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
11847
diff
changeset
|
12 $ hg tag -f -r0 t1 |
11847 | 13 $ hg tags |
14 tip 3:a49829c4fc11 | |
15 t1 0:f7b1eb17ad24 | |
6671
938eddd76237
tag: record tag we're superseding, if any (issue 1102)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
16 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
13135
diff
changeset
|
17 $ cd .. |