Mercurial > evolve

comparison tests/test-topic-push-concurrent-on.t @ 3013:945a0989e41b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
packaging: merge stable back into default 6.7.0 has been released.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 27 Sep 2017 16:26:30 +0200
parents bd7e8be29542
children f5d472b7e800 f7129e3d5a38
comparison
equal deleted inserted replaced
3012:081070828703 3013:945a0989e41b
91 (branches are permanent and global, did you want a bookmark?) 91 (branches are permanent and global, did you want a bookmark?)
92 $ hg commit --amend 92 $ hg commit --amend
93 $ hg outgoing -G 93 $ hg outgoing -G
94 comparing with $TESTTMP/main (glob) 94 comparing with $TESTTMP/main (glob)
95 searching for changes 95 searching for changes
96 @ 4 mountain draft CC 96 @ 3 mountain draft CC
97 97
98 $ hg push 98 $ hg push
99 pushing to $TESTTMP/main (glob) 99 pushing to $TESTTMP/main (glob)
100 searching for changes 100 searching for changes
101 abort: push creates new remote branches: mountain! 101 abort: push creates new remote branches: mountain!
106 searching for changes 106 searching for changes
107 adding changesets 107 adding changesets
108 adding manifests 108 adding manifests
109 adding file changes 109 adding file changes
110 added 1 changesets with 1 changes to 1 files (+1 heads) 110 added 1 changesets with 1 changes to 1 files (+1 heads)
111 2 new obsolescence markers 111 1 new obsolescence markers
112 112
113 Including on non-publishing 113 Including on non-publishing
114 114
115 $ hg push --new-branch draft 115 $ hg push --new-branch draft
116 pushing to $TESTTMP/draft (glob) 116 pushing to $TESTTMP/draft (glob)
117 searching for changes 117 searching for changes
118 adding changesets 118 adding changesets
119 adding manifests 119 adding manifests
120 adding file changes 120 adding file changes
121 added 3 changesets with 3 changes to 3 files (+1 heads) 121 added 3 changesets with 3 changes to 3 files (+1 heads)
122 2 new obsolescence markers 122 1 new obsolescence markers
123 123
124 Testing topic behavior 124 Testing topic behavior
125 ====================== 125 ======================
126 126
127 Local peer tests 127 Local peer tests
134 $ echo aaa > ddd 134 $ echo aaa > ddd
135 $ hg add ddd 135 $ hg add ddd
136 $ hg commit -m 'CD' 136 $ hg commit -m 'CD'
137 active topic 'babar' grew its first changeset 137 active topic 'babar' grew its first changeset
138 $ hg log -G # keep track of phase because I saw some strange bug during developement 138 $ hg log -G # keep track of phase because I saw some strange bug during developement
139 @ 5 default babar draft CD 139 @ 4 default babar draft CD
140 | 140 |
141 | o 4 mountain public CC 141 | o 3 mountain public CC
142 |/ 142 |/
143 | o 1 default public CB 143 | o 1 default public CB
144 |/ 144 |/
145 o 0 default public CA 145 o 0 default public CA
146 146
153 adding changesets 153 adding changesets
154 adding manifests 154 adding manifests
155 adding file changes 155 adding file changes
156 added 1 changesets with 1 changes to 1 files (+1 heads) 156 added 1 changesets with 1 changes to 1 files (+1 heads)
157 $ hg log -G 157 $ hg log -G
158 @ 5 default babar draft CD 158 @ 4 default babar draft CD
159 | 159 |
160 | o 4 mountain public CC 160 | o 3 mountain public CC
161 |/ 161 |/
162 | o 1 default public CB 162 | o 1 default public CB
163 |/ 163 |/
164 o 0 default public CA 164 o 0 default public CA
165 165
171 searching for changes 171 searching for changes
172 abort: push creates new remote head 67f579af159d! 172 abort: push creates new remote head 67f579af159d!
173 (merge or see 'hg help push' for details about pushing new heads) 173 (merge or see 'hg help push' for details about pushing new heads)
174 [255] 174 [255]
175 $ hg log -G 175 $ hg log -G
176 @ 5 default babar draft CD 176 @ 4 default babar draft CD
177 | 177 |
178 | o 4 mountain public CC 178 | o 3 mountain public CC
179 |/ 179 |/
180 | o 1 default public CB 180 | o 1 default public CB
181 |/ 181 |/
182 o 0 default public CA 182 o 0 default public CA
183 183
192 $ echo aaa > eee 192 $ echo aaa > eee
193 $ hg add eee 193 $ hg add eee
194 $ hg commit -m 'CE' 194 $ hg commit -m 'CE'
195 active topic 'celeste' grew its first changeset 195 active topic 'celeste' grew its first changeset
196 $ hg log -G # keep track of phase because I saw some strange bug during developement 196 $ hg log -G # keep track of phase because I saw some strange bug during developement
197 @ 6 default celeste draft CE 197 @ 5 default celeste draft CE
198 | 198 |
199 | o 5 default babar draft CD 199 | o 4 default babar draft CD
200 |/ 200 |/
201 | o 4 mountain public CC 201 | o 3 mountain public CC
202 |/ 202 |/
203 | o 1 default public CB 203 | o 1 default public CB
204 |/ 204 |/
205 o 0 default public CA 205 o 0 default public CA
206 206
216 searching for changes 216 searching for changes
217 abort: push creates new remote head 84eaf32db6c3! 217 abort: push creates new remote head 84eaf32db6c3!
218 (merge or see 'hg help push' for details about pushing new heads) 218 (merge or see 'hg help push' for details about pushing new heads)
219 [255] 219 [255]
220 $ hg log -G 220 $ hg log -G
221 @ 6 default celeste draft CE 221 @ 5 default celeste draft CE
222 | 222 |
223 | o 5 default babar draft CD 223 | o 4 default babar draft CD
224 |/ 224 |/
225 | o 4 mountain public CC 225 | o 3 mountain public CC
226 |/ 226 |/
227 | o 1 default public CB 227 | o 1 default public CB
228 |/ 228 |/
229 o 0 default public CA 229 o 0 default public CA
230 230
239 remote: adding changesets 239 remote: adding changesets
240 remote: adding manifests 240 remote: adding manifests
241 remote: adding file changes 241 remote: adding file changes
242 remote: added 1 changesets with 1 changes to 1 files (+1 heads) 242 remote: added 1 changesets with 1 changes to 1 files (+1 heads)
243 $ hg log -G 243 $ hg log -G
244 @ 6 default celeste draft CE 244 @ 5 default celeste draft CE
245 | 245 |
246 | o 5 default babar draft CD 246 | o 4 default babar draft CD
247 |/ 247 |/
248 | o 4 mountain public CC 248 | o 3 mountain public CC
249 |/ 249 |/
250 | o 1 default public CB 250 | o 1 default public CB
251 |/ 251 |/
252 o 0 default public CA 252 o 0 default public CA
253 253
259 searching for changes 259 searching for changes
260 abort: push creates new remote head 67f579af159d! 260 abort: push creates new remote head 67f579af159d!
261 (merge or see 'hg help push' for details about pushing new heads) 261 (merge or see 'hg help push' for details about pushing new heads)
262 [255] 262 [255]
263 $ hg log -G 263 $ hg log -G
264 @ 6 default celeste draft CE 264 @ 5 default celeste draft CE
265 | 265 |
266 | o 5 default babar draft CD 266 | o 4 default babar draft CD
267 |/ 267 |/
268 | o 4 mountain public CC 268 | o 3 mountain public CC
269 |/ 269 |/
270 | o 1 default public CB 270 | o 1 default public CB
271 |/ 271 |/
272 o 0 default public CA 272 o 0 default public CA
273 273
281 marked working directory as topic: babar 281 marked working directory as topic: babar
282 $ echo aaa > fff 282 $ echo aaa > fff
283 $ hg add fff 283 $ hg add fff
284 $ hg commit -m 'CF' 284 $ hg commit -m 'CF'
285 $ hg log -G 285 $ hg log -G
286 @ 7 default babar draft CF 286 @ 6 default babar draft CF
287 | 287 |
288 | o 6 default celeste draft CE 288 | o 5 default celeste draft CE
289 | | 289 | |
290 | | o 5 default babar draft CD 290 | | o 4 default babar draft CD
291 | |/ 291 | |/
292 | | o 4 mountain public CC 292 | | o 3 mountain public CC
293 | |/ 293 | |/
294 o | 1 default public CB 294 o | 1 default public CB
295 |/ 295 |/
296 o 0 default public CA 296 o 0 default public CA
297 297
319 $ hg merge 'desc(CG)' 319 $ hg merge 'desc(CG)'
320 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 320 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
321 (branch merge, don't forget to commit) 321 (branch merge, don't forget to commit)
322 $ hg commit -m 'CM' 322 $ hg commit -m 'CM'
323 $ hg log -G 323 $ hg log -G
324 @ 9 default babar draft CM 324 @ 8 default babar draft CM
325 |\ 325 |\
326 | o 8 default draft CG 326 | o 7 default draft CG
327 | | 327 | |
328 o | 7 default babar draft CF 328 o | 6 default babar draft CF
329 | | 329 | |
330 | | o 6 default celeste draft CE 330 | | o 5 default celeste draft CE
331 | |/ 331 | |/
332 | | o 5 default babar draft CD 332 | | o 4 default babar draft CD
333 | |/ 333 | |/
334 | | o 4 mountain public CC 334 | | o 3 mountain public CC
335 | |/ 335 | |/
336 o | 1 default public CB 336 o | 1 default public CB
337 |/ 337 |/
338 o 0 default public CA 338 o 0 default public CA
339 339