comparison tests/test-obsmarkers-effectflag.t @ 34418:57980af73cfa

effectflag: detect when branch changed Store in effect flag when the branch changed between the predecessor and its successors. It can happens with "hg branch" + "hg commit --amend", "hg branch" + "hg amend" or "histedit". Differential Revision: https://phab.mercurial-scm.org/D538
author Boris Feld <boris.feld@octobus.net>
date Thu, 06 Jul 2017 14:55:12 +0200
parents 54af8de9bd09
children fa26f5891e68
comparison
equal deleted inserted replaced
34417:54af8de9bd09 34418:57980af73cfa
63 $ hg commit --amend 63 $ hg commit --amend
64 64
65 check result 65 check result
66 66
67 $ hg debugobsolete --rev . 67 $ hg debugobsolete --rev .
68 bd3db8264ceebf1966319f5df3be7aac6acd1a8e 14a01456e0574f0e0a0b15b2345486a6364a8d79 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'amend', 'user': 'test'} 68 bd3db8264ceebf1966319f5df3be7aac6acd1a8e 14a01456e0574f0e0a0b15b2345486a6364a8d79 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '64', 'operation': 'amend', 'user': 'test'}
69 69
70 $ hg up default 70 $ hg up default
71 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 71 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
72 72
73 rebase (parents change) 73 rebase (parents change)
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': '49', 'operation': 'amend', 'user': 'test'} 109 fad47e5bd78e6aa4db1b5a0a1751bc12563655ff a94e0fd5f1c81d969381a76eb0d37ce499a44fae 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '113', '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