comparison tests/test-obsmarkers-effectflag.t @ 34416:55ef17ec8e59

effectflag: detect when user changed Store in effect flag when the user changed between the predecessor and its successors. It can happens with "hg commit --amend -u" or "histedit". Differential Revision: https://phab.mercurial-scm.org/D536
author Boris Feld <boris.feld@octobus.net>
date Thu, 06 Jul 2017 14:53:48 +0200
parents 51aadc0d0da2
children 54af8de9bd09
comparison
equal deleted inserted replaced
34415:51aadc0d0da2 34416:55ef17ec8e59
38 $ hg commit --amend -u "bob <bob@bob.com>" 38 $ hg commit --amend -u "bob <bob@bob.com>"
39 39
40 check result 40 check result
41 41
42 $ hg debugobsolete --rev . 42 $ hg debugobsolete --rev .
43 ef4a313b1e0ade55718395d80e6b88c5ccd875eb 5485c92d34330dac9d7a63dc07e1e3373835b964 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'amend', 'user': 'test'} 43 ef4a313b1e0ade55718395d80e6b88c5ccd875eb 5485c92d34330dac9d7a63dc07e1e3373835b964 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '16', 'operation': 'amend', 'user': 'test'}
44 44
45 amend touching the date only 45 amend touching the date only
46 ---------------------------- 46 ----------------------------
47 47
48 $ mkcommit B1 48 $ mkcommit B1
104 $ hg commit --amend -m F1 -u "bob <bob@bob.com>" -d "42 0" 104 $ hg commit --amend -m F1 -u "bob <bob@bob.com>" -d "42 0"
105 105
106 check result 106 check result
107 107
108 $ hg debugobsolete --rev . 108 $ hg debugobsolete --rev .
109 fad47e5bd78e6aa4db1b5a0a1751bc12563655ff a94e0fd5f1c81d969381a76eb0d37ce499a44fae 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} 109 fad47e5bd78e6aa4db1b5a0a1751bc12563655ff a94e0fd5f1c81d969381a76eb0d37ce499a44fae 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '17', 'operation': 'amend', 'user': 'test'}
110 110
111 rebase not touching the diff 111 rebase not touching the diff
112 ---------------------------- 112 ----------------------------
113 113
114 $ cat << EOF > H0 114 $ cat << EOF > H0