Mercurial > evolve

comparison tests/test-sharing.t @ 1450:5f6e78aea094 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable Test are updated to run with current mercurial stable (3.4.1)
author Pierre-Yves David <pierre-yves.david@fb.com>
date Thu, 25 Jun 2015 16:55:27 -0700
parents 848a04c078c7
children 73eb4f33f9dc
comparison
equal deleted inserted replaced
1438:3295353b1363 1450:5f6e78aea094
138 searching for changes 138 searching for changes
139 adding changesets 139 adding changesets
140 adding manifests 140 adding manifests
141 adding file changes 141 adding file changes
142 added 1 changesets with 1 changes to 1 files 142 added 1 changesets with 1 changes to 1 files
143 pushing 4 obsolescence markers (* bytes) (glob) 143 pushing 4 obsolescence markers (369 bytes)
144 4 obsolescence markers added 144 4 obsolescence markers added
145 145
146 Now that the fix is public, we cannot amend it any more. 146 Now that the fix is public, we cannot amend it any more.
147 $ hg amend -m 'fix bug 37' 147 $ hg amend -m 'fix bug 37'
148 abort: cannot amend public changesets 148 abort: cannot amend public changesets
159 4:de6151c48e1c draft fix bug 37 159 4:de6151c48e1c draft fix bug 37
160 $ hg push ../dev-repo 160 $ hg push ../dev-repo
161 pushing to ../dev-repo 161 pushing to ../dev-repo
162 searching for changes 162 searching for changes
163 no changes found 163 no changes found
164 pushing 4 obsolescence markers (* bytes) (glob) 164 pushing 4 obsolescence markers (369 bytes)
165 0 obsolescence markers added 165 0 obsolescence markers added
166 [1] 166 [1]
167 $ hg -R ../dev-repo shortlog -r 'draft()' 167 $ hg -R ../dev-repo shortlog -r 'draft()'
168 168
169 Sharing with multiple developers: code review 169 Sharing with multiple developers: code review
194 searching for changes 194 searching for changes
195 adding changesets 195 adding changesets
196 adding manifests 196 adding manifests
197 adding file changes 197 adding file changes
198 added 1 changesets with 1 changes to 1 files 198 added 1 changesets with 1 changes to 1 files
199 pushing 4 obsolescence markers (* bytes) (glob) 199 pushing 4 obsolescence markers (369 bytes)
200 0 obsolescence markers added 200 0 obsolescence markers added
201 exporting bookmark bug15 201 exporting bookmark bug15
202 $ hg -R ../review bookmarks 202 $ hg -R ../review bookmarks
203 bug15 2:f91e97234c2b 203 bug15 2:f91e97234c2b
204 204
211 searching for changes 211 searching for changes
212 adding changesets 212 adding changesets
213 adding manifests 213 adding manifests
214 adding file changes 214 adding file changes
215 added 1 changesets with 1 changes to 1 files (+1 heads) 215 added 1 changesets with 1 changes to 1 files (+1 heads)
216 pushing 6 obsolescence markers (* bytes) (glob) 216 pushing 6 obsolescence markers (553 bytes)
217 2 obsolescence markers added 217 2 obsolescence markers added
218 updating bookmark bug15 218 updating bookmark bug15
219 $ hg -R ../review bookmarks 219 $ hg -R ../review bookmarks
220 bug15 3:cbdfbd5a5db2 220 bug15 3:cbdfbd5a5db2
221 221
239 remote has heads on branch 'default' that are not known locally: cbdfbd5a5db2 239 remote has heads on branch 'default' that are not known locally: cbdfbd5a5db2
240 adding changesets 240 adding changesets
241 adding manifests 241 adding manifests
242 adding file changes 242 adding file changes
243 added 1 changesets with 1 changes to 1 files (+1 heads) 243 added 1 changesets with 1 changes to 1 files (+1 heads)
244 pushing 4 obsolescence markers (* bytes) (glob) 244 pushing 4 obsolescence markers (369 bytes)
245 0 obsolescence markers added 245 0 obsolescence markers added
246 exporting bookmark featureX 246 exporting bookmark featureX
247 $ hg -R ../review bookmarks 247 $ hg -R ../review bookmarks
248 bug15 3:cbdfbd5a5db2 248 bug15 3:cbdfbd5a5db2
249 featureX 4:193657d1e852 249 featureX 4:193657d1e852
257 remote has heads on branch 'default' that are not known locally: cbdfbd5a5db2 257 remote has heads on branch 'default' that are not known locally: cbdfbd5a5db2
258 adding changesets 258 adding changesets
259 adding manifests 259 adding manifests
260 adding file changes 260 adding file changes
261 added 1 changesets with 1 changes to 1 files (+1 heads) 261 added 1 changesets with 1 changes to 1 files (+1 heads)
262 pushing 6 obsolescence markers (* bytes) (glob) 262 pushing 6 obsolescence markers (553 bytes)
263 2 obsolescence markers added 263 2 obsolescence markers added
264 updating bookmark featureX 264 updating bookmark featureX
265 265
266 Bob receives second review, amends, and pushes to public: 266 Bob receives second review, amends, and pushes to public:
267 this time, he's sure he got it right! 267 this time, he's sure he got it right!
272 searching for changes 272 searching for changes
273 adding changesets 273 adding changesets
274 adding manifests 274 adding manifests
275 adding file changes 275 adding file changes
276 added 1 changesets with 1 changes to 1 files 276 added 1 changesets with 1 changes to 1 files
277 pushing 8 obsolescence markers (* bytes) (glob) 277 pushing 8 obsolescence markers (736 bytes)
278 4 obsolescence markers added 278 4 obsolescence markers added
279 $ hg -R ../public bookmarks 279 $ hg -R ../public bookmarks
280 no bookmarks set 280 no bookmarks set
281 $ hg push ../review 281 $ hg push ../review
282 pushing to ../review 282 pushing to ../review
284 remote has heads on branch 'default' that are not known locally: cbdfbd5a5db2 284 remote has heads on branch 'default' that are not known locally: cbdfbd5a5db2
285 adding changesets 285 adding changesets
286 adding manifests 286 adding manifests
287 adding file changes 287 adding file changes
288 added 1 changesets with 1 changes to 1 files (+1 heads) 288 added 1 changesets with 1 changes to 1 files (+1 heads)
289 pushing 8 obsolescence markers (* bytes) (glob) 289 pushing 8 obsolescence markers (736 bytes)
290 2 obsolescence markers added 290 2 obsolescence markers added
291 updating bookmark featureX 291 updating bookmark featureX
292 $ hg -R ../review bookmarks 292 $ hg -R ../review bookmarks
293 bug15 3:cbdfbd5a5db2 293 bug15 3:cbdfbd5a5db2
294 featureX 6:540ba8f317e6 294 featureX 6:540ba8f317e6
386 searching for changes 386 searching for changes
387 adding changesets 387 adding changesets
388 adding manifests 388 adding manifests
389 adding file changes 389 adding file changes
390 added 1 changesets with 1 changes to 1 files 390 added 1 changesets with 1 changes to 1 files
391 pushing 11 obsolescence markers (* bytes) (glob) 391 pushing 11 obsolescence markers (999 bytes)
392 3 obsolescence markers added 392 3 obsolescence markers added
393 $ hg push ../review 393 $ hg push ../review
394 pushing to ../review 394 pushing to ../review
395 searching for changes 395 searching for changes
396 adding changesets 396 adding changesets
397 adding manifests 397 adding manifests
398 adding file changes 398 adding file changes
399 added 1 changesets with 0 changes to 1 files 399 added 1 changesets with 0 changes to 1 files
400 pushing 11 obsolescence markers (* bytes) (glob) 400 pushing 11 obsolescence markers (999 bytes)
401 1 obsolescence markers added 401 1 obsolescence markers added
402 updating bookmark bug15 402 updating bookmark bug15
403 403
404 Figure SG08: review and public changesets after Alice pushes. 404 Figure SG08: review and public changesets after Alice pushes.
405 $ hg --hidden -R ../review shortlog -G -r 1:: 405 $ hg --hidden -R ../review shortlog -G -r 1::
509 $ hg --hidden shortlog -r 'successors(2fe6)' 509 $ hg --hidden shortlog -r 'successors(2fe6)'
510 6:a360947f6faf draft fix bug 24 (v2 by bob) 510 6:a360947f6faf draft fix bug 24 (v2 by bob)
511 7:e3f99ce9d9cd draft fix bug 24 (v2 by alice) 511 7:e3f99ce9d9cd draft fix bug 24 (v2 by alice)
512 512
513 Use evolve to fix the divergence. 513 Use evolve to fix the divergence.
514 $ HGMERGE=internal:other hg evolve 514 $ HGMERGE=internal:other hg evolve --divergent
515 merge:[6] fix bug 24 (v2 by bob) 515 merge:[6] fix bug 24 (v2 by bob)
516 with: [7] fix bug 24 (v2 by alice) 516 with: [7] fix bug 24 (v2 by alice)
517 base: [4] fix bug 24 (v1) 517 base: [4] fix bug 24 (v1)
518 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 518 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
519 working directory is now at 5ad6037c046c 519 working directory is now at 5ad6037c046c