Mercurial > evolve

comparison tests/test-evolve-obshistory.t @ 3593:b92114f201c9 mercurial-4.1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.2 into mercurial-4.1
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 21 Mar 2018 16:35:18 +0100
parents 7a5c3175015e b21a3753255f
children
comparison
equal deleted inserted replaced
3592:7a5c3175015e 3593:b92114f201c9
10 > interactive = true 10 > interactive = true
11 > [phases] 11 > [phases]
12 > publish=False 12 > publish=False
13 > [extensions] 13 > [extensions]
14 > evolve = 14 > evolve =
15 > color =
15 > [experimental] 16 > [experimental]
16 > evolution.effect-flags = yes 17 > evolution.effect-flags = yes
17 > EOF 18 > EOF
18 19
19 Test output on amended commit 20 Test output on amended commit
202 "shortdescription": "A0" 203 "shortdescription": "A0"
203 } 204 }
204 ] 205 ]
205 $ hg update 471f378eab4c 206 $ hg update 471f378eab4c
206 abort: hidden revision '471f378eab4c'! 207 abort: hidden revision '471f378eab4c'!
207 (use --hidden to access hidden revisions; successor: 4ae3a4151de9) 208 (use --hidden to access hidden revisions)
208 [255] 209 [255]
209 $ hg update --hidden "desc(A0)" 210 $ hg update --hidden "desc(A0)"
210 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 211 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
211 working directory parent is obsolete! (471f378eab4c) 212 working directory parent is obsolete! (471f378eab4c)
212 (use 'hg evolve' to update to its successor: 4ae3a4151de9) 213 (use 'hg evolve' to update to its successor: 4ae3a4151de9)
301 ] 302 ]
302 $ hg up 1 303 $ hg up 1
303 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 304 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
304 $ hg up 0dec01379d3b 305 $ hg up 0dec01379d3b
305 abort: hidden revision '0dec01379d3b'! 306 abort: hidden revision '0dec01379d3b'!
306 (use --hidden to access hidden revisions; pruned) 307 (use --hidden to access hidden revisions)
307 [255] 308 [255]
308 $ hg up --hidden -r 'desc(B0)' 309 $ hg up --hidden -r 'desc(B0)'
309 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 310 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
310 working directory parent is obsolete! (0dec01379d3b) 311 working directory parent is obsolete! (0dec01379d3b)
311 (use 'hg evolve' to update to its parent successor) 312 (use 'hg evolve' to update to its parent successor)
497 note: testing split 498 note: testing split
498 (No patch available, too many successors (2)) 499 (No patch available, too many successors (2))
499 500
500 $ hg update 471597cad322 501 $ hg update 471597cad322
501 abort: hidden revision '471597cad322'! 502 abort: hidden revision '471597cad322'!
502 (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a) 503 (use --hidden to access hidden revisions)
503 [255] 504 [255]
504 $ hg update --hidden 'min(desc(A0))' 505 $ hg update --hidden 'min(desc(A0))'
505 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 506 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
506 working directory parent is obsolete! (471597cad322) 507 working directory parent is obsolete! (471597cad322)
507 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a) 508 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a)
773 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob) 774 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob)
774 (No patch available, too many successors (4)) 775 (No patch available, too many successors (4))
775 776
776 $ hg update de7290d8b885 777 $ hg update de7290d8b885
777 abort: hidden revision 'de7290d8b885'! 778 abort: hidden revision 'de7290d8b885'!
778 (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a and 2 more) 779 (use --hidden to access hidden revisions)
779 [255] 780 [255]
780 $ hg update --hidden 'min(desc(A0))' 781 $ hg update --hidden 'min(desc(A0))'
781 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 782 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
782 working directory parent is obsolete! (de7290d8b885) 783 working directory parent is obsolete! (de7290d8b885)
783 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a and 2 more) 784 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a and 2 more)
992 "shortdescription": "B0" 993 "shortdescription": "B0"
993 } 994 }
994 ] 995 ]
995 $ hg update 471f378eab4c 996 $ hg update 471f378eab4c
996 abort: hidden revision '471f378eab4c'! 997 abort: hidden revision '471f378eab4c'!
997 (use --hidden to access hidden revisions; successor: eb5a0daa2192) 998 (use --hidden to access hidden revisions)
998 [255] 999 [255]
999 $ hg update --hidden 'desc(A0)' 1000 $ hg update --hidden 'desc(A0)'
1000 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 1001 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1001 working directory parent is obsolete! (471f378eab4c) 1002 working directory parent is obsolete! (471f378eab4c)
1002 (use 'hg evolve' to update to its successor: eb5a0daa2192) 1003 (use 'hg evolve' to update to its successor: eb5a0daa2192)
1003 $ hg update 0dec01379d3b 1004 $ hg update 0dec01379d3b
1004 abort: hidden revision '0dec01379d3b'! 1005 abort: hidden revision '0dec01379d3b'!
1005 (use --hidden to access hidden revisions; successor: eb5a0daa2192) 1006 (use --hidden to access hidden revisions)
1006 [255] 1007 [255]
1007 $ hg update --hidden 'desc(B0)' 1008 $ hg update --hidden 'desc(B0)'
1008 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1009 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1009 working directory parent is obsolete! (0dec01379d3b) 1010 working directory parent is obsolete! (0dec01379d3b)
1010 (use 'hg evolve' to update to its successor: eb5a0daa2192) 1011 (use 'hg evolve' to update to its successor: eb5a0daa2192)
1326 "shortdescription": "A1" 1327 "shortdescription": "A1"
1327 } 1328 }
1328 ] 1329 ]
1329 $ hg update 471f378eab4c 1330 $ hg update 471f378eab4c
1330 abort: hidden revision '471f378eab4c'! 1331 abort: hidden revision '471f378eab4c'!
1331 (use --hidden to access hidden revisions; diverged) 1332 (use --hidden to access hidden revisions)
1332 [255] 1333 [255]
1333 $ hg update --hidden 'desc(A0)' 1334 $ hg update --hidden 'desc(A0)'
1334 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 1335 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1335 working directory parent is obsolete! (471f378eab4c) 1336 working directory parent is obsolete! (471f378eab4c)
1336 (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) 1337 (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
1548 "shortdescription": "A0" 1549 "shortdescription": "A0"
1549 } 1550 }
1550 ] 1551 ]
1551 $ hg update 471f378eab4c 1552 $ hg update 471f378eab4c
1552 abort: hidden revision '471f378eab4c'! 1553 abort: hidden revision '471f378eab4c'!
1553 (use --hidden to access hidden revisions; successor: eb5a0daa2192) 1554 (use --hidden to access hidden revisions)
1554 [255] 1555 [255]
1555 $ hg update --hidden 'desc(A0)' 1556 $ hg update --hidden 'desc(A0)'
1556 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 1557 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1557 working directory parent is obsolete! (471f378eab4c) 1558 working directory parent is obsolete! (471f378eab4c)
1558 (use 'hg evolve' to update to its successor: eb5a0daa2192) 1559 (use 'hg evolve' to update to its successor: eb5a0daa2192)