Mercurial > evolve

comparison tests/test-evolve-obshistory.t @ 3109:3024ae293732 mercurial-4.1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge with mercurial-4.2 branch
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 20 Oct 2017 18:41:05 +0200
parents 9c9c8c1eeb93 00e4d31b8cdb
children 50be10c63825 a1cdc128defd
comparison
equal deleted inserted replaced
3108:9c9c8c1eeb93 3109:3024ae293732
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
177 "shortdescription": "A0" 178 "shortdescription": "A0"
178 } 179 }
179 ] 180 ]
180 $ hg update 471f378eab4c 181 $ hg update 471f378eab4c
181 abort: hidden revision '471f378eab4c'! 182 abort: hidden revision '471f378eab4c'!
182 (use --hidden to access hidden revisions; successor: 4ae3a4151de9) 183 (use --hidden to access hidden revisions)
183 [255] 184 [255]
184 $ hg update --hidden "desc(A0)" 185 $ hg update --hidden "desc(A0)"
185 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 186 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
186 working directory parent is obsolete! (471f378eab4c) 187 working directory parent is obsolete! (471f378eab4c)
187 (use 'hg evolve' to update to its successor: 4ae3a4151de9) 188 (use 'hg evolve' to update to its successor: 4ae3a4151de9)
276 ] 277 ]
277 $ hg up 1 278 $ hg up 1
278 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 279 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
279 $ hg up 0dec01379d3b 280 $ hg up 0dec01379d3b
280 abort: hidden revision '0dec01379d3b'! 281 abort: hidden revision '0dec01379d3b'!
281 (use --hidden to access hidden revisions; pruned) 282 (use --hidden to access hidden revisions)
282 [255] 283 [255]
283 $ hg up --hidden -r 'desc(B0)' 284 $ hg up --hidden -r 'desc(B0)'
284 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 285 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
285 working directory parent is obsolete! (0dec01379d3b) 286 working directory parent is obsolete! (0dec01379d3b)
286 (use 'hg evolve' to update to its parent successor) 287 (use 'hg evolve' to update to its parent successor)
463 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob) 464 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
464 (No patch available, too many successors (2)) 465 (No patch available, too many successors (2))
465 466
466 $ hg update 471597cad322 467 $ hg update 471597cad322
467 abort: hidden revision '471597cad322'! 468 abort: hidden revision '471597cad322'!
468 (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a) 469 (use --hidden to access hidden revisions)
469 [255] 470 [255]
470 $ hg update --hidden 'min(desc(A0))' 471 $ hg update --hidden 'min(desc(A0))'
471 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 472 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
472 working directory parent is obsolete! (471597cad322) 473 working directory parent is obsolete! (471597cad322)
473 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a) 474 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a)
739 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob) 740 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob)
740 (No patch available, too many successors (4)) 741 (No patch available, too many successors (4))
741 742
742 $ hg update de7290d8b885 743 $ hg update de7290d8b885
743 abort: hidden revision 'de7290d8b885'! 744 abort: hidden revision 'de7290d8b885'!
744 (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a and 2 more) 745 (use --hidden to access hidden revisions)
745 [255] 746 [255]
746 $ hg update --hidden 'min(desc(A0))' 747 $ hg update --hidden 'min(desc(A0))'
747 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 748 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
748 working directory parent is obsolete! (de7290d8b885) 749 working directory parent is obsolete! (de7290d8b885)
749 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a and 2 more) 750 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a and 2 more)
954 "shortdescription": "B0" 955 "shortdescription": "B0"
955 } 956 }
956 ] 957 ]
957 $ hg update 471f378eab4c 958 $ hg update 471f378eab4c
958 abort: hidden revision '471f378eab4c'! 959 abort: hidden revision '471f378eab4c'!
959 (use --hidden to access hidden revisions; successor: eb5a0daa2192) 960 (use --hidden to access hidden revisions)
960 [255] 961 [255]
961 $ hg update --hidden 'desc(A0)' 962 $ hg update --hidden 'desc(A0)'
962 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 963 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
963 working directory parent is obsolete! (471f378eab4c) 964 working directory parent is obsolete! (471f378eab4c)
964 (use 'hg evolve' to update to its successor: eb5a0daa2192) 965 (use 'hg evolve' to update to its successor: eb5a0daa2192)
965 $ hg update 0dec01379d3b 966 $ hg update 0dec01379d3b
966 working directory parent is obsolete! (471f378eab4c) 967 working directory parent is obsolete! (471f378eab4c)
967 (use 'hg evolve' to update to its successor: eb5a0daa2192) 968 (use 'hg evolve' to update to its successor: eb5a0daa2192)
968 abort: hidden revision '0dec01379d3b'! 969 abort: hidden revision '0dec01379d3b'!
969 (use --hidden to access hidden revisions; successor: eb5a0daa2192) 970 (use --hidden to access hidden revisions)
970 [255] 971 [255]
971 $ hg update --hidden 'desc(B0)' 972 $ hg update --hidden 'desc(B0)'
972 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 973 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
973 working directory parent is obsolete! (0dec01379d3b) 974 working directory parent is obsolete! (0dec01379d3b)
974 (use 'hg evolve' to update to its successor: eb5a0daa2192) 975 (use 'hg evolve' to update to its successor: eb5a0daa2192)
1276 "shortdescription": "A1" 1277 "shortdescription": "A1"
1277 } 1278 }
1278 ] 1279 ]
1279 $ hg update 471f378eab4c 1280 $ hg update 471f378eab4c
1280 abort: hidden revision '471f378eab4c'! 1281 abort: hidden revision '471f378eab4c'!
1281 (use --hidden to access hidden revisions; diverged) 1282 (use --hidden to access hidden revisions)
1282 [255] 1283 [255]
1283 $ hg update --hidden 'desc(A0)' 1284 $ hg update --hidden 'desc(A0)'
1284 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 1285 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1285 working directory parent is obsolete! (471f378eab4c) 1286 working directory parent is obsolete! (471f378eab4c)
1286 (471f378eab4c has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue) 1287 (471f378eab4c has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue)
1494 "shortdescription": "A0" 1495 "shortdescription": "A0"
1495 } 1496 }
1496 ] 1497 ]
1497 $ hg update 471f378eab4c 1498 $ hg update 471f378eab4c
1498 abort: hidden revision '471f378eab4c'! 1499 abort: hidden revision '471f378eab4c'!
1499 (use --hidden to access hidden revisions; successor: eb5a0daa2192) 1500 (use --hidden to access hidden revisions)
1500 [255] 1501 [255]
1501 $ hg update --hidden 'desc(A0)' 1502 $ hg update --hidden 'desc(A0)'
1502 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 1503 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1503 working directory parent is obsolete! (471f378eab4c) 1504 working directory parent is obsolete! (471f378eab4c)
1504 (use 'hg evolve' to update to its successor: eb5a0daa2192) 1505 (use 'hg evolve' to update to its successor: eb5a0daa2192)