Mercurial > evolve

comparison tests/test-fold.t @ 6006:90af9db93d2b mercurial-4.7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.8 into mercurial-4.7
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 12 Aug 2021 22:01:14 +0200
parents be8f7eb3f3a0
children 55e9987b8384
comparison
equal deleted inserted replaced
6005:2da0e17ca1c0 6006:90af9db93d2b
92 92
93 $ hg fold --from -r 'desc("r5")' 93 $ hg fold --from -r 'desc("r5")'
94 3 changesets folded 94 3 changesets folded
95 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 95 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
96 $ hg debugobsolete -r 'desc("r5")' --exclusive 96 $ hg debugobsolete -r 'desc("r5")' --exclusive
97 4de32a90b66cd083ebf3c00b41277aa7abca51dd 198b5c405d01a50c41a81a00fc61677b81981a5f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '37', 'fold-id': '25cb328e', 'fold-idx': '3', 'fold-size': '3', 'operation': 'fold', 'user': 'test'} 97 4de32a90b66cd083ebf3c00b41277aa7abca51dd 198b5c405d01a50c41a81a00fc61677b81981a5f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '37', 'operation': 'fold', 'user': 'test'}
98 c8d03c1b5e94af74b772900c58259d2e08917735 198b5c405d01a50c41a81a00fc61677b81981a5f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '33', 'fold-id': '25cb328e', 'fold-idx': '1', 'fold-size': '3', 'operation': 'fold', 'user': 'test'} 98 c8d03c1b5e94af74b772900c58259d2e08917735 198b5c405d01a50c41a81a00fc61677b81981a5f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '33', 'operation': 'fold', 'user': 'test'}
99 f69452c5b1af6cbaaa56ef50cf94fff5bcc6ca23 198b5c405d01a50c41a81a00fc61677b81981a5f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '37', 'fold-id': '25cb328e', 'fold-idx': '2', 'fold-size': '3', 'operation': 'fold', 'user': 'test'} 99 f69452c5b1af6cbaaa56ef50cf94fff5bcc6ca23 198b5c405d01a50c41a81a00fc61677b81981a5f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '37', 'operation': 'fold', 'user': 'test'}
100 100
101 $ hg obslog --no-origin 101 $ hg obslog --no-origin
102 @ 198b5c405d01 (11) r5 102 @ 198b5c405d01 (11) r5
103 |\ 103 |\
104 | \ 104 | \
105 | |\ 105 | |\
106 x | | 4de32a90b66c (7) r7 106 x | | 4de32a90b66c (7) r7
107 / / folded(description, date, parent) as 198b5c405d01 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 107 / / rewritten(description, date, parent) as 198b5c405d01 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
108 | | 108 | |
109 x | c8d03c1b5e94 (5) r5 109 x | c8d03c1b5e94 (5) r5
110 / folded(description, date) as 198b5c405d01 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 110 / rewritten(description, date) as 198b5c405d01 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
111 | 111 |
112 x f69452c5b1af (6) r6 112 x f69452c5b1af (6) r6
113 folded(description, date, parent) as 198b5c405d01 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 113 rewritten(description, date, parent) as 198b5c405d01 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
114 114
115 $ hg obslog 115 $ hg obslog
116 @ 198b5c405d01 (11) r5 116 @ 198b5c405d01 (11) r5
117 |\ folded(description, date, parent) from 4de32a90b66c, c8d03c1b5e94, f69452c5b1af using fold by test (Thu Jan 01 00:00:00 1970 +0000) 117 |\ rewritten(description, date, parent) from 4de32a90b66c using fold by test (Thu Jan 01 00:00:00 1970 +0000)
118 | | rewritten(description, date) from c8d03c1b5e94 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
119 | | rewritten(description, date, parent) from f69452c5b1af using fold by test (Thu Jan 01 00:00:00 1970 +0000)
118 | | 120 | |
119 | \ 121 | \
120 | |\ 122 | |\
121 x | | 4de32a90b66c (7) r7 123 x | | 4de32a90b66c (7) r7
122 / / 124 / /