Mercurial > evolve

comparison tests/test-topic-push.t @ 3105:f5d472b7e800 mercurial-4.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: revert output changes related to temporary amend commit This backed out changeset 06844693bb21 and other related changes.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 20 Oct 2017 19:32:18 +0200
parents c29a19413e92
children 85cdce113c2c
comparison
equal deleted inserted replaced
3104:3dd5a6f83f8b 3105:f5d472b7e800
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 @ 3 mountain draft CC 92 @ 4 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 1 new obsolescence markers 107 2 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 1 new obsolescence markers 118 2 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
130 $ echo aaa > ddd 130 $ echo aaa > ddd
131 $ hg add ddd 131 $ hg add ddd
132 $ hg commit -m 'CD' 132 $ hg commit -m 'CD'
133 active topic 'babar' grew its first changeset 133 active topic 'babar' grew its first changeset
134 $ hg log -G # keep track of phase because I saw some strange bug during developement 134 $ hg log -G # keep track of phase because I saw some strange bug during developement
135 @ 4 default babar draft CD 135 @ 5 default babar draft CD
136 | 136 |
137 | o 3 mountain public CC 137 | o 4 mountain public CC
138 |/ 138 |/
139 | o 1 default public CB 139 | o 1 default public CB
140 |/ 140 |/
141 o 0 default public CA 141 o 0 default public CA
142 142
149 adding changesets 149 adding changesets
150 adding manifests 150 adding manifests
151 adding file changes 151 adding file changes
152 added 1 changesets with 1 changes to 1 files (+1 heads) 152 added 1 changesets with 1 changes to 1 files (+1 heads)
153 $ hg log -G 153 $ hg log -G
154 @ 4 default babar draft CD 154 @ 5 default babar draft CD
155 | 155 |
156 | o 3 mountain public CC 156 | o 4 mountain public CC
157 |/ 157 |/
158 | o 1 default public CB 158 | o 1 default public CB
159 |/ 159 |/
160 o 0 default public CA 160 o 0 default public CA
161 161
176 2 files updated, 0 files merged, 1 files removed, 0 files unresolved 176 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
177 $ hg topic --clear 177 $ hg topic --clear
178 $ echo bbb >> bbb 178 $ echo bbb >> bbb
179 $ hg commit -m "C'B" 179 $ hg commit -m "C'B"
180 $ hg log -G 180 $ hg log -G
181 @ 6 default draft C'B 181 @ 7 default draft C'B
182 | 182 |
183 | o 5 default babar draft C'A 183 | o 6 default babar draft C'A
184 | | 184 | |
185 | o 4 default babar draft CD 185 | o 5 default babar draft CD
186 | | 186 | |
187 | | o 3 mountain public CC 187 | | o 4 mountain public CC
188 | |/ 188 | |/
189 o | 1 default public CB 189 o | 1 default public CB
190 |/ 190 |/
191 o 0 default public CA 191 o 0 default public CA
192 192
193 $ hg outgoing draft --topic babar 193 $ hg outgoing draft --topic babar
194 comparing with $TESTTMP/draft 194 comparing with $TESTTMP/draft
195 searching for changes 195 searching for changes
196 5 default babar draft C'A 196 6 default babar draft C'A
197 $ hg push draft --topic babar 197 $ hg push draft --topic babar
198 pushing to $TESTTMP/draft 198 pushing to $TESTTMP/draft
199 searching for changes 199 searching for changes
200 adding changesets 200 adding changesets
201 adding manifests 201 adding manifests
222 searching for changes 222 searching for changes
223 abort: push creates new remote head 67f579af159d! 223 abort: push creates new remote head 67f579af159d!
224 (merge or see 'hg help push' for details about pushing new heads) 224 (merge or see 'hg help push' for details about pushing new heads)
225 [255] 225 [255]
226 $ hg log -G 226 $ hg log -G
227 @ 4 default babar draft CD 227 @ 5 default babar draft CD
228 | 228 |
229 | o 3 mountain public CC 229 | o 4 mountain public CC
230 |/ 230 |/
231 | o 1 default public CB 231 | o 1 default public CB
232 |/ 232 |/
233 o 0 default public CA 233 o 0 default public CA
234 234
243 $ echo aaa > eee 243 $ echo aaa > eee
244 $ hg add eee 244 $ hg add eee
245 $ hg commit -m 'CE' 245 $ hg commit -m 'CE'
246 active topic 'celeste' grew its first changeset 246 active topic 'celeste' grew its first changeset
247 $ hg log -G # keep track of phase because I saw some strange bug during developement 247 $ hg log -G # keep track of phase because I saw some strange bug during developement
248 @ 5 default celeste draft CE 248 @ 6 default celeste draft CE
249 | 249 |
250 | o 4 default babar draft CD 250 | o 5 default babar draft CD
251 |/ 251 |/
252 | o 3 mountain public CC 252 | o 4 mountain public CC
253 |/ 253 |/
254 | o 1 default public CB 254 | o 1 default public CB
255 |/ 255 |/
256 o 0 default public CA 256 o 0 default public CA
257 257
267 searching for changes 267 searching for changes
268 abort: push creates new remote head 84eaf32db6c3! 268 abort: push creates new remote head 84eaf32db6c3!
269 (merge or see 'hg help push' for details about pushing new heads) 269 (merge or see 'hg help push' for details about pushing new heads)
270 [255] 270 [255]
271 $ hg log -G 271 $ hg log -G
272 @ 5 default celeste draft CE 272 @ 6 default celeste draft CE
273 | 273 |
274 | o 4 default babar draft CD 274 | o 5 default babar draft CD
275 |/ 275 |/
276 | o 3 mountain public CC 276 | o 4 mountain public CC
277 |/ 277 |/
278 | o 1 default public CB 278 | o 1 default public CB
279 |/ 279 |/
280 o 0 default public CA 280 o 0 default public CA
281 281
290 remote: adding changesets 290 remote: adding changesets
291 remote: adding manifests 291 remote: adding manifests
292 remote: adding file changes 292 remote: adding file changes
293 remote: added 1 changesets with 1 changes to 1 files (+1 heads) 293 remote: added 1 changesets with 1 changes to 1 files (+1 heads)
294 $ hg log -G 294 $ hg log -G
295 @ 5 default celeste draft CE 295 @ 6 default celeste draft CE
296 | 296 |
297 | o 4 default babar draft CD 297 | o 5 default babar draft CD
298 |/ 298 |/
299 | o 3 mountain public CC 299 | o 4 mountain public CC
300 |/ 300 |/
301 | o 1 default public CB 301 | o 1 default public CB
302 |/ 302 |/
303 o 0 default public CA 303 o 0 default public CA
304 304
310 searching for changes 310 searching for changes
311 abort: push creates new remote head 67f579af159d! 311 abort: push creates new remote head 67f579af159d!
312 (merge or see 'hg help push' for details about pushing new heads) 312 (merge or see 'hg help push' for details about pushing new heads)
313 [255] 313 [255]
314 $ hg log -G 314 $ hg log -G
315 @ 5 default celeste draft CE 315 @ 6 default celeste draft CE
316 | 316 |
317 | o 4 default babar draft CD 317 | o 5 default babar draft CD
318 |/ 318 |/
319 | o 3 mountain public CC 319 | o 4 mountain public CC
320 |/ 320 |/
321 | o 1 default public CB 321 | o 1 default public CB
322 |/ 322 |/
323 o 0 default public CA 323 o 0 default public CA
324 324
332 marked working directory as topic: babar 332 marked working directory as topic: babar
333 $ echo aaa > fff 333 $ echo aaa > fff
334 $ hg add fff 334 $ hg add fff
335 $ hg commit -m 'CF' 335 $ hg commit -m 'CF'
336 $ hg log -G 336 $ hg log -G
337 @ 6 default babar draft CF 337 @ 7 default babar draft CF
338 | 338 |
339 | o 5 default celeste draft CE 339 | o 6 default celeste draft CE
340 | | 340 | |
341 | | o 4 default babar draft CD 341 | | o 5 default babar draft CD
342 | |/ 342 | |/
343 | | o 3 mountain public CC 343 | | o 4 mountain public CC
344 | |/ 344 | |/
345 o | 1 default public CB 345 o | 1 default public CB
346 |/ 346 |/
347 o 0 default public CA 347 o 0 default public CA
348 348
370 $ hg merge 'desc(CG)' 370 $ hg merge 'desc(CG)'
371 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 371 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
372 (branch merge, don't forget to commit) 372 (branch merge, don't forget to commit)
373 $ hg commit -m 'CM' 373 $ hg commit -m 'CM'
374 $ hg log -G 374 $ hg log -G
375 @ 8 default babar draft CM 375 @ 9 default babar draft CM
376 |\ 376 |\
377 | o 7 default draft CG 377 | o 8 default draft CG
378 | | 378 | |
379 o | 6 default babar draft CF 379 o | 7 default babar draft CF
380 | | 380 | |
381 | | o 5 default celeste draft CE 381 | | o 6 default celeste draft CE
382 | |/ 382 | |/
383 | | o 4 default babar draft CD 383 | | o 5 default babar draft CD
384 | |/ 384 | |/
385 | | o 3 mountain public CC 385 | | o 4 mountain public CC
386 | |/ 386 | |/
387 o | 1 default public CB 387 o | 1 default public CB
388 |/ 388 |/
389 o 0 default public CA 389 o 0 default public CA
390 390