Mercurial > hg
annotate tests/test-empty-dir.t @ 31976:e0b6421b2fc5
obsolescence: add test for the "branch replacement" logic during push, case A3
Mercurial checks for the introduction of new heads on push. Evolution comes
into play to detect if existing branches on the server are being replaced by
some of the new one we push.
The current code for this logic is very basic (eg: issue4354) and was poorly
tested. We have a better implementation coming in the evolve extension fixing
these issues and with more serious tests coverage. In the process of upstreaming
this improved logic, we start with adding the test case that are already passing
with the current implementation. Once they are all in, we'll upstream the better
implementation and the extra test case.
See inline documentation for details about the test case added in this
changeset.
author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
---|---|
date | Thu, 13 Apr 2017 16:23:18 +0200 |
parents | 3b165c127690 |
children |
rev | line source |
---|---|
12158
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
1 $ hg init |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
2 |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
3 $ echo 123 > a |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
4 $ hg add a |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
5 $ hg commit -m "first" a |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
6 |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
7 $ mkdir sub |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
8 $ echo 321 > sub/b |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
9 $ hg add sub/b |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
10 $ hg commit -m "second" sub/b |
578 | 11 |
12158
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
12 $ cat sub/b |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
13 321 |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
14 |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
15 $ hg co 0 |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
16 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
578 | 17 |
12158
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
18 $ cat sub/b 2>/dev/null || echo "sub/b not present" |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
19 sub/b not present |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
20 |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
21 $ test -d sub || echo "sub not present" |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
22 sub not present |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
23 |