Mercurial > evolve

comparison tests/test-exchange-C2.t @ 845:7957eecd5592

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
exchange: add test case for C.2
author Pierre-Yves David <pierre-yves.david@fb.com>
date Mon, 03 Mar 2014 20:39:50 -0800
parents
children b177fde040dd
comparison
equal deleted inserted replaced
844:45ca2d5f84be 845:7957eecd5592
1
2
3 Initial setup
4
5 $ . $TESTDIR/_exc-util.sh
6
7 === C.2 Pruned changeset on precursors ===
8
9 .. {{{
10 .. B ⊗
11 .. |
12 .. A ø⇠◔ A'
13 .. |/
14 .. ● O
15 .. }}}
16 ..
17 .. Marker exist from:
18 ..
19 .. * A' succeed to A
20 .. * B (prune)
21 ..
22 .. Command run:
23 ..
24 .. * hg push -r A'
25 .. * hg push
26 ..
27 .. Expected exchange:
28 ..
29 .. * `A ø⇠o A'`
30 .. * B (prune)
31
32 $ setuprepos C.2
33 creating test repo for test case C.2
34 - pulldest
35 - main
36 - pushdest
37 cd into `main` and proceed with env setup
38 $ cd main
39 $ mkcommit A0
40 $ mkcommit B
41 $ hg prune -qd '0 0' .
42 $ hg update -q 0
43 $ mkcommit A1
44 created new head
45 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
46 $ hg log -G --hidden
47 @ e5ea8f9c7314 (draft): A1
48 |
49 | x 06055a7959d4 (draft): B
50 | |
51 | x 28b51eb45704 (draft): A0
52 |/
53 o a9bdc8b26820 (public): O
54
55 $ hg debugobsolete
56 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
57 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
58 $ cd ..
59 $ cd ..
60
61 $ cp -r C.2 C.2.a
62 $ cp -r C.2 C.2.b
63
64 Actual Test (explicite push)
65 -------------------------------------
66
67 $ dotest C.2.a A1
68 ## Running testcase C.2.a
69 # testing echange of "A1" (e5ea8f9c7314)
70 ## initial state
71 # obstore: main
72 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
73 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
74 # obstore: pushdest
75 # obstore: pulldest
76 ## pushing "A1" from main to pushdest
77 pushing to pushdest
78 searching for changes
79 adding changesets
80 adding manifests
81 adding file changes
82 added 1 changesets with 1 changes to 1 files
83 OBSEXC: computing relevant nodes
84 OBSEXC: computing markers relevant to 2 nodes
85 OBSEXC: encoding 2 markers
86 OBSEXC: sending 1 pushkey payload (188 bytes)
87 OBSEXC: DONE
88 ## post push state
89 # obstore: main
90 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
91 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
92 # obstore: pushdest
93 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
94 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
95 # obstore: pulldest
96 ## pulling "e5ea8f9c7314" from main into pulldest
97 pulling from main
98 searching for changes
99 adding changesets
100 adding manifests
101 adding file changes
102 added 1 changesets with 1 changes to 1 files
103 OBSEXC: pull obsolescence markers
104 OBSEXC: merging obsolescence markers (150 bytes)
105 OBSEXC: 2 markers added
106 OBSEXC: DONE
107 (run 'hg update' to get a working copy)
108 ## post pull state
109 # obstore: main
110 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
111 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
112 # obstore: pushdest
113 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
114 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
115 # obstore: pulldest
116 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
117 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
118
119 Actual Test (bare push)
120 -------------------------------------
121
122 $ dotest C.2.b
123 ## Running testcase C.2.b
124 ## initial state
125 # obstore: main
126 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
127 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
128 # obstore: pushdest
129 # obstore: pulldest
130 ## pushing from main to pushdest
131 pushing to pushdest
132 searching for changes
133 adding changesets
134 adding manifests
135 adding file changes
136 added 1 changesets with 1 changes to 1 files
137 OBSEXC: computing relevant nodes
138 OBSEXC: computing markers relevant to 2 nodes
139 OBSEXC: encoding 2 markers
140 OBSEXC: sending 1 pushkey payload (188 bytes)
141 OBSEXC: DONE
142 ## post push state
143 # obstore: main
144 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
145 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
146 # obstore: pushdest
147 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
148 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
149 # obstore: pulldest
150 ## pulling from main into pulldest
151 pulling from main
152 searching for changes
153 adding changesets
154 adding manifests
155 adding file changes
156 added 1 changesets with 1 changes to 1 files
157 OBSEXC: pull obsolescence markers
158 OBSEXC: merging obsolescence markers (150 bytes)
159 OBSEXC: 2 markers added
160 OBSEXC: DONE
161 (run 'hg update' to get a working copy)
162 ## post pull state
163 # obstore: main
164 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
165 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
166 # obstore: pushdest
167 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
168 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
169 # obstore: pulldest
170 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
171 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}