##// END OF EJS Templates
obsolescence: add test case D-3 for obsolescence markers exchange...
Pierre-Yves David -
r31971:73e9328e default
parent child Browse files
Show More
@@ -0,0 +1,108 b''
1 ============================================
2 Testing obsolescence markers push: Cases D.3
3 ============================================
4
5 Mercurial pushes obsolescences markers relevant to the "pushed-set", the set of
6 all changesets that requested to be "in sync" after the push (even if they are
7 already on both side).
8
9 This test belongs to a series of tests checking such set is properly computed
10 and applied. This does not tests "obsmarkers" discovery capabilities.
11
12 Category D: Partial Information Case
13 TestCase 3: missing prune target (prune not in "pushed set")
14
15 D.3 missing prune target (prune not in "pushed set")
16 ====================================================
17
18 .. {{{
19 .. A ΓΈβ‡ βœ• A'
20 .. | |
21 .. | β—‹ B
22 .. |/
23 .. ● O
24 .. }}}
25 ..
26 .. Marker exist from:
27 ..
28 .. * `A ΓΈβ‡ o A'`
29 .. * A' (prune)
30 ..
31 .. Command runs:
32 ..
33 .. * hg push
34 ..
35 .. Expected exclude:
36 ..
37 .. * `A ΓΈβ‡ o A'`
38 .. * A' (prune)
39
40 Setup
41 -----
42
43 $ . $TESTDIR/testlib/exchange-obsmarker-util.sh
44
45 initial
46
47 $ setuprepos D.3
48 creating test repo for test case D.3
49 - pulldest
50 - main
51 - pushdest
52 cd into `main` and proceed with env setup
53 $ cd main
54 $ mkcommit A0
55 $ hg up -q 0
56 $ mkcommit B
57 created new head
58 $ mkcommit A1
59 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
60 $ hg prune -d '0 0' .
61 $ hg strip --hidden -q 'desc(A1)'
62 $ hg log -G --hidden
63 @ 35b183996678 (draft): B
64 |
65 | x 28b51eb45704 (draft): A0
66 |/
67 o a9bdc8b26820 (public): O
68
69 $ inspect_obsmarkers
70 obsstore content
71 ================
72 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
73 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
74 $ cd ..
75 $ cd ..
76
77 Actual Test
78 -----------
79
80 $ dotest D.3 O
81 ## Running testcase D.3
82 # testing echange of "O" (a9bdc8b26820)
83 ## initial state
84 # obstore: main
85 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
86 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
87 # obstore: pushdest
88 # obstore: pulldest
89 ## pushing "O" from main to pushdest
90 pushing to pushdest
91 searching for changes
92 no changes found
93 ## post push state
94 # obstore: main
95 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
96 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
97 # obstore: pushdest
98 # obstore: pulldest
99 ## pulling "a9bdc8b26820" from main into pulldest
100 pulling from main
101 no changes found
102 ## post pull state
103 # obstore: main
104 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
105 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
106 # obstore: pushdest
107 # obstore: pulldest
108
General Comments 0
You need to be logged in to leave comments. Login now