comparison tests/test-fold.t @ 5162:a7fb433faab6 mercurial-4.7

test-compat: merge mercurial-4.8 into mercurial-4.7
author Anton Shestakov <av6@dwimlabs.net>
date Sat, 29 Feb 2020 15:17:31 +0700
parents a66c9fc9c503
children 011b53a9d03c
comparison
equal deleted inserted replaced
5161:58b225aa4298 5162:a7fb433faab6
94 94
95 $ hg fold --from -r 'desc("r5")' 95 $ hg fold --from -r 'desc("r5")'
96 3 changesets folded 96 3 changesets folded
97 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 97 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
98 $ hg debugobsolete -r 'desc("r5")' --exclusive 98 $ hg debugobsolete -r 'desc("r5")' --exclusive
99 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'} 99 4de32a90b66cd083ebf3c00b41277aa7abca51dd 198b5c405d01a50c41a81a00fc61677b81981a5f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '37', 'operation': 'fold', 'user': 'test'}
100 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'} 100 c8d03c1b5e94af74b772900c58259d2e08917735 198b5c405d01a50c41a81a00fc61677b81981a5f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '33', 'operation': 'fold', 'user': 'test'}
101 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'} 101 f69452c5b1af6cbaaa56ef50cf94fff5bcc6ca23 198b5c405d01a50c41a81a00fc61677b81981a5f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '37', 'operation': 'fold', 'user': 'test'}
102 102
103 Checking whether the bookmarks are moved or not 103 Checking whether the bookmarks are moved or not
104 104
105 $ hg log -G 105 $ hg log -G
106 @ 11 - 198b5c405d01 r5 [debugbuilddag] (draft) bm1 106 @ 11 - 198b5c405d01 r5 [debugbuilddag] (draft) bm1