Mercurial > evolve

comparison tests/test-exchange-obsmarkers-case-D1.t @ 3592:7a5c3175015e mercurial-4.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.3 into mercurial-4.2
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 21 Mar 2018 16:32:54 +0100
parents 98941c28f3e2 9c9c8c1eeb93
children
comparison
equal deleted inserted replaced
3591:98941c28f3e2 3592:7a5c3175015e
59 $ mkcommit B 59 $ mkcommit B
60 $ hg up -q 0 60 $ hg up -q 0
61 $ mkcommit A1 61 $ mkcommit A1
62 created new head 62 created new head
63 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` 63 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
64 obsoleted 1 changesets
65 $ hg prune -d '0 0' 'desc(B)' 64 $ hg prune -d '0 0' 'desc(B)'
66 1 changesets pruned 65 1 changesets pruned
67 $ hg strip --hidden -q 'desc(A0)' --config devel.strip-obsmarkers=no 66 $ hg strip --hidden -q 'desc(A0)' --config devel.strip-obsmarkers=no
68 $ hg log -G --hidden 67 $ hg log -G --hidden
69 @ e5ea8f9c7314 (draft): A1 68 @ e5ea8f9c7314 (draft): A1
71 o a9bdc8b26820 (public): O 70 o a9bdc8b26820 (public): O
72 71
73 $ inspect_obsmarkers 72 $ inspect_obsmarkers
74 obsstore content 73 obsstore content
75 ================ 74 ================
76 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 75 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
77 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 76 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
78 obshashtree 77 obshashtree
79 =========== 78 ===========
80 a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000 79 a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
81 e5ea8f9c73143125d36658e90ef70c6d2027a5b7 289cb0d058c81c763eca8bb438657dba9a7ba646 80 e5ea8f9c73143125d36658e90ef70c6d2027a5b7 163059af30d498e215e86e1ead6ab749521c38be
82 obshashrange 81 obshashrange
83 ============ 82 ============
84 rev node index size depth obshash 83 rev node index size depth obshash
85 1 e5ea8f9c7314 0 2 2 289cb0d058c8 84 1 e5ea8f9c7314 0 2 2 163059af30d4
86 0 a9bdc8b26820 0 1 1 000000000000 85 0 a9bdc8b26820 0 1 1 000000000000
87 1 e5ea8f9c7314 1 1 2 289cb0d058c8 86 1 e5ea8f9c7314 1 1 2 163059af30d4
88 $ cd .. 87 $ cd ..
89 $ cd .. 88 $ cd ..
90 89
91 $ cp -R D.1 D.1.a 90 $ cp -R D.1 D.1.a
92 $ cp -R D.1 D.1.b 91 $ cp -R D.1 D.1.b
97 $ dotest D.1.a A1 96 $ dotest D.1.a A1
98 ## Running testcase D.1.a 97 ## Running testcase D.1.a
99 # testing echange of "A1" (e5ea8f9c7314) 98 # testing echange of "A1" (e5ea8f9c7314)
100 ## initial state 99 ## initial state
101 # obstore: main 100 # obstore: main
102 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 101 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
103 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 102 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
104 # obstore: pushdest 103 # obstore: pushdest
105 # obstore: pulldest 104 # obstore: pulldest
106 ## pushing "A1" from main to pushdest 105 ## pushing "A1" from main to pushdest
107 pushing to pushdest 106 pushing to pushdest
108 searching for changes 107 searching for changes
111 remote: adding file changes 110 remote: adding file changes
112 remote: added 1 changesets with 1 changes to 1 files 111 remote: added 1 changesets with 1 changes to 1 files
113 remote: 2 new obsolescence markers 112 remote: 2 new obsolescence markers
114 ## post push state 113 ## post push state
115 # obstore: main 114 # obstore: main
116 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 115 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
117 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 116 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
118 # obstore: pushdest 117 # obstore: pushdest
119 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 118 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
120 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 119 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
121 # obstore: pulldest 120 # obstore: pulldest
122 ## pulling "e5ea8f9c7314" from main into pulldest 121 ## pulling "e5ea8f9c7314" from main into pulldest
123 pulling from main 122 pulling from main
124 searching for changes 123 searching for changes
125 adding changesets 124 adding changesets
128 added 1 changesets with 1 changes to 1 files 127 added 1 changesets with 1 changes to 1 files
129 2 new obsolescence markers 128 2 new obsolescence markers
130 (run 'hg update' to get a working copy) 129 (run 'hg update' to get a working copy)
131 ## post pull state 130 ## post pull state
132 # obstore: main 131 # obstore: main
133 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 132 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
134 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 133 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
135 # obstore: pushdest 134 # obstore: pushdest
136 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 135 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
137 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 136 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
138 # obstore: pulldest 137 # obstore: pulldest
139 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 138 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
140 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 139 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
141 140
142 Actual Test (base push) 141 Actual Test (base push)
143 --------------------------- 142 ---------------------------
144 143
145 $ dotest D.1.b 144 $ dotest D.1.b
146 ## Running testcase D.1.b 145 ## Running testcase D.1.b
147 ## initial state 146 ## initial state
148 # obstore: main 147 # obstore: main
149 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 148 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
150 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 149 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
151 # obstore: pushdest 150 # obstore: pushdest
152 # obstore: pulldest 151 # obstore: pulldest
153 ## pushing from main to pushdest 152 ## pushing from main to pushdest
154 pushing to pushdest 153 pushing to pushdest
155 searching for changes 154 searching for changes
158 remote: adding file changes 157 remote: adding file changes
159 remote: added 1 changesets with 1 changes to 1 files 158 remote: added 1 changesets with 1 changes to 1 files
160 remote: 2 new obsolescence markers 159 remote: 2 new obsolescence markers
161 ## post push state 160 ## post push state
162 # obstore: main 161 # obstore: main
163 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 162 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
164 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 163 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
165 # obstore: pushdest 164 # obstore: pushdest
166 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 165 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
167 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 166 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
168 # obstore: pulldest 167 # obstore: pulldest
169 ## pulling from main into pulldest 168 ## pulling from main into pulldest
170 pulling from main 169 pulling from main
171 searching for changes 170 searching for changes
172 adding changesets 171 adding changesets
175 added 1 changesets with 1 changes to 1 files 174 added 1 changesets with 1 changes to 1 files
176 2 new obsolescence markers 175 2 new obsolescence markers
177 (run 'hg update' to get a working copy) 176 (run 'hg update' to get a working copy)
178 ## post pull state 177 ## post pull state
179 # obstore: main 178 # obstore: main
180 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 179 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
181 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 180 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
182 # obstore: pushdest 181 # obstore: pushdest
183 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 182 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
184 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 183 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
185 # obstore: pulldest 184 # obstore: pulldest
186 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 185 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
187 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 186 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
188 187