##// END OF EJS Templates
obsolescence: add test for the "branch replacement" logic during push, case A1...
Pierre-Yves David -
r31974:e2848a1b default
parent child Browse files
Show More
@@ -0,0 +1,69 b''
1 ====================================
2 Testing head checking code: Case A-1
3 ====================================
4
5 Mercurial checks for the introduction of new heads on push. Evolution comes
6 into play to detect if existing branches on the server are being replaced by
7 some of the new one we push.
8
9 This case is part of a series of tests checking this behavior.
10
11 Category A: simple case involving a branch being superceeded by another.
12 TestCase 1: single-changeset branch
13
14 .. old-state:
15 ..
16 .. * 1 changeset branch
17 ..
18 .. new-state:
19 ..
20 .. * 1 changeset branch succeeding to A
21 ..
22 .. expected-result:
23 ..
24 .. * push allowed
25 ..
26 .. graph-summary:
27 ..
28 .. A ΓΈβ‡ β—” A'
29 .. |/
30 .. ●
31
32 $ . $TESTDIR/testlib/push-checkheads-util.sh
33
34 Test setup
35 ----------
36
37 $ mkdir A1
38 $ cd A1
39 $ setuprepos
40 creating basic server and client repo
41 updating to branch default
42 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
43 $ cd client
44 $ hg up 0
45 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
46 $ mkcommit A1
47 created new head
48 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
49 $ hg log -G --hidden
50 @ f6082bc4ffef (draft): A1
51 |
52 | x 8aaa48160adc (draft): A0
53 |/
54 o 1e4be0697311 (public): root
55
56
57 Actual testing
58 --------------
59
60 $ hg push
61 pushing to $TESTTMP/A1/server (glob)
62 searching for changes
63 adding changesets
64 adding manifests
65 adding file changes
66 added 1 changesets with 1 changes to 1 files (+1 heads)
67 1 new obsolescence markers
68
69 $ cd ../..
General Comments 0
You need to be logged in to leave comments. Login now