Mercurial > evolve

comparison tests/test-evolve-issue6097.t @ 5304:83ceafbaa7d6 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: merge into stable in preparation for release
author Anton Shestakov <av6@dwimlabs.net>
date Fri, 08 May 2020 18:22:26 +0800
parents e8660b28bfee
children c2fab88e6d60
comparison
equal deleted inserted replaced
5252:a828c7a7ace1 5304:83ceafbaa7d6
59 date: Thu Jan 01 00:00:00 1970 +0000 59 date: Thu Jan 01 00:00:00 1970 +0000
60 obsolete: rewritten using amend, rebase as 3:2868fe6df617 60 obsolete: rewritten using amend, rebase as 3:2868fe6df617
61 summary: apricot 61 summary: apricot
62 62
63 63
64 $ hg debugobsolete
65 692cc7b6212c102a9eafcf04ed2e4bfca5023754 32acf8fb1b2325c727135dcd65153745a031a125 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'}
66 32acf8fb1b2325c727135dcd65153745a031a125 2868fe6df617a3045cf668e4ab1c486a8692abd1 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '12', 'operation': 'rebase', 'user': 'test'}
67 e0486f65907dac7107e72a247386845e6a9fd83b 0 {692cc7b6212c102a9eafcf04ed2e4bfca5023754} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
64 $ hg obslog 68 $ hg obslog
65 @ 2868fe6df617 (3) apricot and coconut 69 @ 2868fe6df617 (3) apricot and coconut
70 | rewritten(parent, content) from 32acf8fb1b23 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
66 | 71 |
67 x 32acf8fb1b23 (2) apricot and coconut 72 x 32acf8fb1b23 (2) apricot and coconut
68 | rewritten(parent, content) as 2868fe6df617 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) 73 | rewritten(description, content) from 692cc7b6212c using amend by test (Thu Jan 01 00:00:00 1970 +0000)
69 | 74 |
70 x 692cc7b6212c (0) apricot 75 x 692cc7b6212c (0) apricot
71 rewritten(description, content) as 32acf8fb1b23 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
72 76
73 77
74 $ hg evolve -r . 78 $ hg evolve -r .
75 move:[3] apricot and coconut 79 move:[3] apricot and coconut
76 atop:[-1] 80 atop:[-1]
83 user: test 87 user: test
84 date: Thu Jan 01 00:00:00 1970 +0000 88 date: Thu Jan 01 00:00:00 1970 +0000
85 summary: apricot and coconut 89 summary: apricot and coconut
86 90
87 91
92 $ hg debugobsolete
93 692cc7b6212c102a9eafcf04ed2e4bfca5023754 32acf8fb1b2325c727135dcd65153745a031a125 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'}
94 32acf8fb1b2325c727135dcd65153745a031a125 2868fe6df617a3045cf668e4ab1c486a8692abd1 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '12', 'operation': 'rebase', 'user': 'test'}
95 e0486f65907dac7107e72a247386845e6a9fd83b 0 {692cc7b6212c102a9eafcf04ed2e4bfca5023754} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
96 2868fe6df617a3045cf668e4ab1c486a8692abd1 bb847d1d3a5f3de90f4fd5e845b69d848568401a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
88 $ hg obslog 97 $ hg obslog
89 @ bb847d1d3a5f (4) apricot and coconut 98 @ bb847d1d3a5f (4) apricot and coconut
99 | rebased(parent) from 2868fe6df617 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
90 | 100 |
91 x 2868fe6df617 (3) apricot and coconut 101 x 2868fe6df617 (3) apricot and coconut
92 | rebased(parent) as bb847d1d3a5f using evolve by test (Thu Jan 01 00:00:00 1970 +0000) 102 | rewritten(parent, content) from 32acf8fb1b23 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
93 | 103 |
94 x 32acf8fb1b23 (2) apricot and coconut 104 x 32acf8fb1b23 (2) apricot and coconut
95 | rewritten(parent, content) as 2868fe6df617 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) 105 | rewritten(description, content) from 692cc7b6212c using amend by test (Thu Jan 01 00:00:00 1970 +0000)
96 | 106 |
97 x 692cc7b6212c (0) apricot 107 x 692cc7b6212c (0) apricot
98 rewritten(description, content) as 32acf8fb1b23 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
99 108