Mercurial > evolve

comparison tests/test-topic-push.t @ 2929:06844693bb21

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: update after removing of redundant amend commit Following e8a7c1a0565a, temporary amend commits has been removed impacting all revision numbers in tests including amend operations. Update tests case to use description or hashes when possible and update revisions number when not.
author Boris Feld <boris.feld@octobus.net>
date Fri, 15 Sep 2017 15:48:18 +0200
parents 800463d6478c
children
comparison
equal deleted inserted replaced
2928:6275808e89ef 2929:06844693bb21
87 (branches are permanent and global, did you want a bookmark?) 87 (branches are permanent and global, did you want a bookmark?)
88 $ hg commit --amend 88 $ hg commit --amend
89 $ hg outgoing -G 89 $ hg outgoing -G
90 comparing with $TESTTMP/main (glob) 90 comparing with $TESTTMP/main (glob)
91 searching for changes 91 searching for changes
92 @ 4 mountain draft CC 92 @ 3 mountain draft CC
93 93
94 $ hg push 94 $ hg push
95 pushing to $TESTTMP/main (glob) 95 pushing to $TESTTMP/main (glob)
96 searching for changes 96 searching for changes
97 abort: push creates new remote branches: mountain! 97 abort: push creates new remote branches: mountain!
102 searching for changes 102 searching for changes
103 adding changesets 103 adding changesets
104 adding manifests 104 adding manifests
105 adding file changes 105 adding file changes
106 added 1 changesets with 1 changes to 1 files (+1 heads) 106 added 1 changesets with 1 changes to 1 files (+1 heads)
107 2 new obsolescence markers 107 1 new obsolescence markers
108 108
109 Including on non-publishing 109 Including on non-publishing
110 110
111 $ hg push --new-branch draft 111 $ hg push --new-branch draft
112 pushing to $TESTTMP/draft (glob) 112 pushing to $TESTTMP/draft (glob)
113 searching for changes 113 searching for changes
114 adding changesets 114 adding changesets
115 adding manifests 115 adding manifests
116 adding file changes 116 adding file changes
117 added 3 changesets with 3 changes to 3 files (+1 heads) 117 added 3 changesets with 3 changes to 3 files (+1 heads)
118 2 new obsolescence markers 118 1 new obsolescence markers
119 119
120 Testing topic behavior 120 Testing topic behavior
121 ====================== 121 ======================
122 122
123 Local peer tests 123 Local peer tests
128 $ hg topic babar 128 $ hg topic babar
129 $ echo aaa > ddd 129 $ echo aaa > ddd
130 $ hg add ddd 130 $ hg add ddd
131 $ hg commit -m 'CD' 131 $ hg commit -m 'CD'
132 $ hg log -G # keep track of phase because I saw some strange bug during developement 132 $ hg log -G # keep track of phase because I saw some strange bug during developement
133 @ 5 default babar draft CD 133 @ 4 default babar draft CD
134 | 134 |
135 | o 4 mountain public CC 135 | o 3 mountain public CC
136 |/ 136 |/
137 | o 1 default public CB 137 | o 1 default public CB
138 |/ 138 |/
139 o 0 default public CA 139 o 0 default public CA
140 140
147 adding changesets 147 adding changesets
148 adding manifests 148 adding manifests
149 adding file changes 149 adding file changes
150 added 1 changesets with 1 changes to 1 files (+1 heads) 150 added 1 changesets with 1 changes to 1 files (+1 heads)
151 $ hg log -G 151 $ hg log -G
152 @ 5 default babar draft CD 152 @ 4 default babar draft CD
153 | 153 |
154 | o 4 mountain public CC 154 | o 3 mountain public CC
155 |/ 155 |/
156 | o 1 default public CB 156 | o 1 default public CB
157 |/ 157 |/
158 o 0 default public CA 158 o 0 default public CA
159 159
165 searching for changes 165 searching for changes
166 abort: push creates new remote head 67f579af159d! 166 abort: push creates new remote head 67f579af159d!
167 (merge or see 'hg help push' for details about pushing new heads) 167 (merge or see 'hg help push' for details about pushing new heads)
168 [255] 168 [255]
169 $ hg log -G 169 $ hg log -G
170 @ 5 default babar draft CD 170 @ 4 default babar draft CD
171 | 171 |
172 | o 4 mountain public CC 172 | o 3 mountain public CC
173 |/ 173 |/
174 | o 1 default public CB 174 | o 1 default public CB
175 |/ 175 |/
176 o 0 default public CA 176 o 0 default public CA
177 177
184 $ hg topic celeste 184 $ hg topic celeste
185 $ echo aaa > eee 185 $ echo aaa > eee
186 $ hg add eee 186 $ hg add eee
187 $ hg commit -m 'CE' 187 $ hg commit -m 'CE'
188 $ hg log -G # keep track of phase because I saw some strange bug during developement 188 $ hg log -G # keep track of phase because I saw some strange bug during developement
189 @ 6 default celeste draft CE 189 @ 5 default celeste draft CE
190 | 190 |
191 | o 5 default babar draft CD 191 | o 4 default babar draft CD
192 |/ 192 |/
193 | o 4 mountain public CC 193 | o 3 mountain public CC
194 |/ 194 |/
195 | o 1 default public CB 195 | o 1 default public CB
196 |/ 196 |/
197 o 0 default public CA 197 o 0 default public CA
198 198
208 searching for changes 208 searching for changes
209 abort: push creates new remote head 84eaf32db6c3! 209 abort: push creates new remote head 84eaf32db6c3!
210 (merge or see 'hg help push' for details about pushing new heads) 210 (merge or see 'hg help push' for details about pushing new heads)
211 [255] 211 [255]
212 $ hg log -G 212 $ hg log -G
213 @ 6 default celeste draft CE 213 @ 5 default celeste draft CE
214 | 214 |
215 | o 5 default babar draft CD 215 | o 4 default babar draft CD
216 |/ 216 |/
217 | o 4 mountain public CC 217 | o 3 mountain public CC
218 |/ 218 |/
219 | o 1 default public CB 219 | o 1 default public CB
220 |/ 220 |/
221 o 0 default public CA 221 o 0 default public CA
222 222
231 remote: adding changesets 231 remote: adding changesets
232 remote: adding manifests 232 remote: adding manifests
233 remote: adding file changes 233 remote: adding file changes
234 remote: added 1 changesets with 1 changes to 1 files (+1 heads) 234 remote: added 1 changesets with 1 changes to 1 files (+1 heads)
235 $ hg log -G 235 $ hg log -G
236 @ 6 default celeste draft CE 236 @ 5 default celeste draft CE
237 | 237 |
238 | o 5 default babar draft CD 238 | o 4 default babar draft CD
239 |/ 239 |/
240 | o 4 mountain public CC 240 | o 3 mountain public CC
241 |/ 241 |/
242 | o 1 default public CB 242 | o 1 default public CB
243 |/ 243 |/
244 o 0 default public CA 244 o 0 default public CA
245 245
251 searching for changes 251 searching for changes
252 abort: push creates new remote head 67f579af159d! 252 abort: push creates new remote head 67f579af159d!
253 (merge or see 'hg help push' for details about pushing new heads) 253 (merge or see 'hg help push' for details about pushing new heads)
254 [255] 254 [255]
255 $ hg log -G 255 $ hg log -G
256 @ 6 default celeste draft CE 256 @ 5 default celeste draft CE
257 | 257 |
258 | o 5 default babar draft CD 258 | o 4 default babar draft CD
259 |/ 259 |/
260 | o 4 mountain public CC 260 | o 3 mountain public CC
261 |/ 261 |/
262 | o 1 default public CB 262 | o 1 default public CB
263 |/ 263 |/
264 o 0 default public CA 264 o 0 default public CA
265 265
272 $ hg topic babar 272 $ hg topic babar
273 $ echo aaa > fff 273 $ echo aaa > fff
274 $ hg add fff 274 $ hg add fff
275 $ hg commit -m 'CF' 275 $ hg commit -m 'CF'
276 $ hg log -G 276 $ hg log -G
277 @ 7 default babar draft CF 277 @ 6 default babar draft CF
278 | 278 |
279 | o 6 default celeste draft CE 279 | o 5 default celeste draft CE
280 | | 280 | |
281 | | o 5 default babar draft CD 281 | | o 4 default babar draft CD
282 | |/ 282 | |/
283 | | o 4 mountain public CC 283 | | o 3 mountain public CC
284 | |/ 284 | |/
285 o | 1 default public CB 285 o | 1 default public CB
286 |/ 286 |/
287 o 0 default public CA 287 o 0 default public CA
288 288
310 $ hg merge 'desc(CG)' 310 $ hg merge 'desc(CG)'
311 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 311 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
312 (branch merge, don't forget to commit) 312 (branch merge, don't forget to commit)
313 $ hg commit -m 'CM' 313 $ hg commit -m 'CM'
314 $ hg log -G 314 $ hg log -G
315 @ 9 default babar draft CM 315 @ 8 default babar draft CM
316 |\ 316 |\
317 | o 8 default draft CG 317 | o 7 default draft CG
318 | | 318 | |
319 o | 7 default babar draft CF 319 o | 6 default babar draft CF
320 | | 320 | |
321 | | o 6 default celeste draft CE 321 | | o 5 default celeste draft CE
322 | |/ 322 | |/
323 | | o 5 default babar draft CD 323 | | o 4 default babar draft CD
324 | |/ 324 | |/
325 | | o 4 mountain public CC 325 | | o 3 mountain public CC
326 | |/ 326 | |/
327 o | 1 default public CB 327 o | 1 default public CB
328 |/ 328 |/
329 o 0 default public CA 329 o 0 default public CA
330 330