Mercurial > hg
annotate tests/test-backwards-remove.t @ 31987:8823daaf4665
obsolescence: add test for the "branch replacement" logic during push, case D2
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 cases.
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:27:42 +0200 |
parents | 4c94b6d0fb1c |
children | 5c2a4f37eace |
rev | line source |
---|---|
11857
9661514f85ae
tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents:
1933
diff
changeset
|
1 $ hg init |
9661514f85ae
tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents:
1933
diff
changeset
|
2 $ echo This is file a1 > a |
9661514f85ae
tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents:
1933
diff
changeset
|
3 $ hg add a |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11857
diff
changeset
|
4 $ hg commit -m "commit #0" |
11857
9661514f85ae
tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents:
1933
diff
changeset
|
5 $ ls |
9661514f85ae
tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents:
1933
diff
changeset
|
6 a |
9661514f85ae
tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents:
1933
diff
changeset
|
7 $ echo This is file b1 > b |
9661514f85ae
tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents:
1933
diff
changeset
|
8 $ hg add b |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11857
diff
changeset
|
9 $ hg commit -m "commit #1" |
11857
9661514f85ae
tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents:
1933
diff
changeset
|
10 $ hg co 0 |
9661514f85ae
tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents:
1933
diff
changeset
|
11 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
9661514f85ae
tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents:
1933
diff
changeset
|
12 |
9661514f85ae
tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents:
1933
diff
changeset
|
13 B should disappear |
9661514f85ae
tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents:
1933
diff
changeset
|
14 |
9661514f85ae
tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents:
1933
diff
changeset
|
15 $ ls |
9661514f85ae
tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents:
1933
diff
changeset
|
16 a |