Mercurial > evolve

comparison tests/test-topic-push.t @ 3440:42b3ac0a5b05 mercurial-4.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge stable into mercurial-4.3
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sat, 20 Jan 2018 12:38:09 +0100
parents 85cdce113c2c
children 537fd9a86c06
comparison
equal deleted inserted replaced
3439:6c772398eb4e 3440:42b3ac0a5b05
88 (branches are permanent and global, did you want a bookmark?) 88 (branches are permanent and global, did you want a bookmark?)
89 $ hg commit --amend 89 $ hg commit --amend
90 $ hg outgoing -G 90 $ hg outgoing -G
91 comparing with $TESTTMP/main (glob) 91 comparing with $TESTTMP/main (glob)
92 searching for changes 92 searching for changes
93 @ 3 mountain draft CC 93 @ 4 mountain draft CC
94 94
95 $ hg push 95 $ hg push
96 pushing to $TESTTMP/main (glob) 96 pushing to $TESTTMP/main (glob)
97 searching for changes 97 searching for changes
98 abort: push creates new remote branches: mountain! 98 abort: push creates new remote branches: mountain!
103 searching for changes 103 searching for changes
104 adding changesets 104 adding changesets
105 adding manifests 105 adding manifests
106 adding file changes 106 adding file changes
107 added 1 changesets with 1 changes to 1 files (+1 heads) 107 added 1 changesets with 1 changes to 1 files (+1 heads)
108 1 new obsolescence markers 108 2 new obsolescence markers
109 109
110 Including on non-publishing 110 Including on non-publishing
111 111
112 $ hg push --new-branch draft 112 $ hg push --new-branch draft
113 pushing to $TESTTMP/draft (glob) 113 pushing to $TESTTMP/draft (glob)
114 searching for changes 114 searching for changes
115 adding changesets 115 adding changesets
116 adding manifests 116 adding manifests
117 adding file changes 117 adding file changes
118 added 3 changesets with 3 changes to 3 files (+1 heads) 118 added 3 changesets with 3 changes to 3 files (+1 heads)
119 1 new obsolescence markers 119 2 new obsolescence markers
120 120
121 Testing topic behavior 121 Testing topic behavior
122 ====================== 122 ======================
123 123
124 Local peer tests 124 Local peer tests
131 $ echo aaa > ddd 131 $ echo aaa > ddd
132 $ hg add ddd 132 $ hg add ddd
133 $ hg commit -m 'CD' 133 $ hg commit -m 'CD'
134 active topic 'babar' grew its first changeset 134 active topic 'babar' grew its first changeset
135 $ hg log -G # keep track of phase because I saw some strange bug during developement 135 $ hg log -G # keep track of phase because I saw some strange bug during developement
136 @ 4 default babar draft CD 136 @ 5 default babar draft CD
137 | 137 |
138 | o 3 mountain public CC 138 | o 4 mountain public CC
139 |/ 139 |/
140 | o 1 default public CB 140 | o 1 default public CB
141 |/ 141 |/
142 o 0 default public CA 142 o 0 default public CA
143 143
150 adding changesets 150 adding changesets
151 adding manifests 151 adding manifests
152 adding file changes 152 adding file changes
153 added 1 changesets with 1 changes to 1 files (+1 heads) 153 added 1 changesets with 1 changes to 1 files (+1 heads)
154 $ hg log -G 154 $ hg log -G
155 @ 4 default babar draft CD 155 @ 5 default babar draft CD
156 | 156 |
157 | o 3 mountain public CC 157 | o 4 mountain public CC
158 |/ 158 |/
159 | o 1 default public CB 159 | o 1 default public CB
160 |/ 160 |/
161 o 0 default public CA 161 o 0 default public CA
162 162
177 2 files updated, 0 files merged, 1 files removed, 0 files unresolved 177 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
178 $ hg topic --clear 178 $ hg topic --clear
179 $ echo bbb >> bbb 179 $ echo bbb >> bbb
180 $ hg commit -m "C'B" 180 $ hg commit -m "C'B"
181 $ hg log -G 181 $ hg log -G
182 @ 6 default draft C'B 182 @ 7 default draft C'B
183 | 183 |
184 | o 5 default babar draft C'A 184 | o 6 default babar draft C'A
185 | | 185 | |
186 | o 4 default babar draft CD 186 | o 5 default babar draft CD
187 | | 187 | |
188 | | o 3 mountain public CC 188 | | o 4 mountain public CC
189 | |/ 189 | |/
190 o | 1 default public CB 190 o | 1 default public CB
191 |/ 191 |/
192 o 0 default public CA 192 o 0 default public CA
193 193
194 $ hg outgoing draft --topic babar 194 $ hg outgoing draft --topic babar
195 comparing with $TESTTMP/draft 195 comparing with $TESTTMP/draft
196 searching for changes 196 searching for changes
197 5 default babar draft C'A 197 6 default babar draft C'A
198 $ hg push draft --topic babar 198 $ hg push draft --topic babar
199 pushing to $TESTTMP/draft 199 pushing to $TESTTMP/draft
200 searching for changes 200 searching for changes
201 adding changesets 201 adding changesets
202 adding manifests 202 adding manifests
223 searching for changes 223 searching for changes
224 abort: push creates new remote head 67f579af159d! 224 abort: push creates new remote head 67f579af159d!
225 (merge or see 'hg help push' for details about pushing new heads) 225 (merge or see 'hg help push' for details about pushing new heads)
226 [255] 226 [255]
227 $ hg log -G 227 $ hg log -G
228 @ 4 default babar draft CD 228 @ 5 default babar draft CD
229 | 229 |
230 | o 3 mountain public CC 230 | o 4 mountain public CC
231 |/ 231 |/
232 | o 1 default public CB 232 | o 1 default public CB
233 |/ 233 |/
234 o 0 default public CA 234 o 0 default public CA
235 235
244 $ echo aaa > eee 244 $ echo aaa > eee
245 $ hg add eee 245 $ hg add eee
246 $ hg commit -m 'CE' 246 $ hg commit -m 'CE'
247 active topic 'celeste' grew its first changeset 247 active topic 'celeste' grew its first changeset
248 $ hg log -G # keep track of phase because I saw some strange bug during developement 248 $ hg log -G # keep track of phase because I saw some strange bug during developement
249 @ 5 default celeste draft CE 249 @ 6 default celeste draft CE
250 | 250 |
251 | o 4 default babar draft CD 251 | o 5 default babar draft CD
252 |/ 252 |/
253 | o 3 mountain public CC 253 | o 4 mountain public CC
254 |/ 254 |/
255 | o 1 default public CB 255 | o 1 default public CB
256 |/ 256 |/
257 o 0 default public CA 257 o 0 default public CA
258 258
268 searching for changes 268 searching for changes
269 abort: push creates new remote head 84eaf32db6c3! 269 abort: push creates new remote head 84eaf32db6c3!
270 (merge or see 'hg help push' for details about pushing new heads) 270 (merge or see 'hg help push' for details about pushing new heads)
271 [255] 271 [255]
272 $ hg log -G 272 $ hg log -G
273 @ 5 default celeste draft CE 273 @ 6 default celeste draft CE
274 | 274 |
275 | o 4 default babar draft CD 275 | o 5 default babar draft CD
276 |/ 276 |/
277 | o 3 mountain public CC 277 | o 4 mountain public CC
278 |/ 278 |/
279 | o 1 default public CB 279 | o 1 default public CB
280 |/ 280 |/
281 o 0 default public CA 281 o 0 default public CA
282 282
291 remote: adding changesets 291 remote: adding changesets
292 remote: adding manifests 292 remote: adding manifests
293 remote: adding file changes 293 remote: adding file changes
294 remote: added 1 changesets with 1 changes to 1 files (+1 heads) 294 remote: added 1 changesets with 1 changes to 1 files (+1 heads)
295 $ hg log -G 295 $ hg log -G
296 @ 5 default celeste draft CE 296 @ 6 default celeste draft CE
297 | 297 |
298 | o 4 default babar draft CD 298 | o 5 default babar draft CD
299 |/ 299 |/
300 | o 3 mountain public CC 300 | o 4 mountain public CC
301 |/ 301 |/
302 | o 1 default public CB 302 | o 1 default public CB
303 |/ 303 |/
304 o 0 default public CA 304 o 0 default public CA
305 305
311 searching for changes 311 searching for changes
312 abort: push creates new remote head 67f579af159d! 312 abort: push creates new remote head 67f579af159d!
313 (merge or see 'hg help push' for details about pushing new heads) 313 (merge or see 'hg help push' for details about pushing new heads)
314 [255] 314 [255]
315 $ hg log -G 315 $ hg log -G
316 @ 5 default celeste draft CE 316 @ 6 default celeste draft CE
317 | 317 |
318 | o 4 default babar draft CD 318 | o 5 default babar draft CD
319 |/ 319 |/
320 | o 3 mountain public CC 320 | o 4 mountain public CC
321 |/ 321 |/
322 | o 1 default public CB 322 | o 1 default public CB
323 |/ 323 |/
324 o 0 default public CA 324 o 0 default public CA
325 325
333 marked working directory as topic: babar 333 marked working directory as topic: babar
334 $ echo aaa > fff 334 $ echo aaa > fff
335 $ hg add fff 335 $ hg add fff
336 $ hg commit -m 'CF' 336 $ hg commit -m 'CF'
337 $ hg log -G 337 $ hg log -G
338 @ 6 default babar draft CF 338 @ 7 default babar draft CF
339 | 339 |
340 | o 5 default celeste draft CE 340 | o 6 default celeste draft CE
341 | | 341 | |
342 | | o 4 default babar draft CD 342 | | o 5 default babar draft CD
343 | |/ 343 | |/
344 | | o 3 mountain public CC 344 | | o 4 mountain public CC
345 | |/ 345 | |/
346 o | 1 default public CB 346 o | 1 default public CB
347 |/ 347 |/
348 o 0 default public CA 348 o 0 default public CA
349 349
372 $ hg merge 'desc(CG)' 372 $ hg merge 'desc(CG)'
373 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 373 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
374 (branch merge, don't forget to commit) 374 (branch merge, don't forget to commit)
375 $ hg commit -m 'CM' 375 $ hg commit -m 'CM'
376 $ hg log -G 376 $ hg log -G
377 @ 8 default babar draft CM 377 @ 9 default babar draft CM
378 |\ 378 |\
379 | o 7 default draft CG 379 | o 8 default draft CG
380 | | 380 | |
381 o | 6 default babar draft CF 381 o | 7 default babar draft CF
382 | | 382 | |
383 | | o 5 default celeste draft CE 383 | | o 6 default celeste draft CE
384 | |/ 384 | |/
385 | | o 4 default babar draft CD 385 | | o 5 default babar draft CD
386 | |/ 386 | |/
387 | | o 3 mountain public CC 387 | | o 4 mountain public CC
388 | |/ 388 | |/
389 o | 1 default public CB 389 o | 1 default public CB
390 |/ 390 |/
391 o 0 default public CA 391 o 0 default public CA
392 392