##// END OF EJS Templates
obsolescence: add test case A-5 for obsolescence markers exchange...
Pierre-Yves David -
r31910:46714216 default
parent child Browse files
Show More
@@ -0,0 +1,136 b''
1 ============================================
2 Testing obsolescence markers push: Cases A.5
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 A: simple cases
13 TestCase 5: partial reordering
14
15 A.5 partial reordering
16 ======================
17
18 ..
19 .. {{{
20 .. B ΓΈβ‡ β‡ 
21 .. | ⇑
22 .. A ΓΈβ‡ β‡ β‡ β—‹ A'
23 .. | ⇑/
24 .. | β—‹ B'
25 .. |/
26 .. ● O
27 .. }}}
28 ..
29 .. Marker exist from:
30 ..
31 .. * `AΓΈβ‡ β—‹ A'`
32 .. * `BΓΈβ‡ β—‹ B'`
33 ..
34 .. Command run:
35 ..
36 .. * hg push -r B
37 ..
38 .. Expected exchange:
39 ..
40 .. * `BΓΈβ‡ β—‹ B'`
41 ..
42 .. Expected Exclude:
43 ..
44 .. * `AΓΈβ‡ β—‹ A'`
45
46 Setup
47 -----
48
49 $ . $TESTDIR/testlib/exchange-obsmarker-util.sh
50
51 initial
52
53 $ setuprepos A.5
54 creating test repo for test case A.5
55 - pulldest
56 - main
57 - pushdest
58 cd into `main` and proceed with env setup
59 $ cd main
60 $ mkcommit A0
61 $ mkcommit B0
62 $ hg update 0
63 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
64 $ mkcommit B1
65 created new head
66 $ mkcommit A1
67 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A0)'`
68 $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`
69 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
70 $ hg log -G --hidden
71 @ 8c0a98c83722 (draft): A1
72 |
73 o f6298a8ac3a4 (draft): B1
74 |
75 | x 6e72f0a95b5e (draft): B0
76 | |
77 | x 28b51eb45704 (draft): A0
78 |/
79 o a9bdc8b26820 (public): O
80
81 $ inspect_obsmarkers
82 obsstore content
83 ================
84 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
85 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
86 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 8c0a98c8372212c6efde4bfdcef006f27ff759d3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
87 $ cd ..
88 $ cd ..
89
90 Actual Test
91 -----------
92
93 $ dotest A.5 B1
94 ## Running testcase A.5
95 # testing echange of "B1" (f6298a8ac3a4)
96 ## initial state
97 # obstore: main
98 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 8c0a98c8372212c6efde4bfdcef006f27ff759d3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
99 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
100 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
101 # obstore: pushdest
102 # obstore: pulldest
103 ## pushing "B1" from main to pushdest
104 pushing to pushdest
105 searching for changes
106 remote: adding changesets
107 remote: adding manifests
108 remote: adding file changes
109 remote: added 1 changesets with 1 changes to 1 files
110 remote: 1 new obsolescence markers
111 ## post push state
112 # obstore: main
113 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 8c0a98c8372212c6efde4bfdcef006f27ff759d3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
114 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
115 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
116 # obstore: pushdest
117 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
118 # obstore: pulldest
119 ## pulling "f6298a8ac3a4" from main into pulldest
120 pulling from main
121 searching for changes
122 adding changesets
123 adding manifests
124 adding file changes
125 added 1 changesets with 1 changes to 1 files
126 1 new obsolescence markers
127 (run 'hg update' to get a working copy)
128 ## post pull state
129 # obstore: main
130 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 8c0a98c8372212c6efde4bfdcef006f27ff759d3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
131 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
132 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
133 # obstore: pushdest
134 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
135 # obstore: pulldest
136 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
General Comments 0
You need to be logged in to leave comments. Login now