Mercurial > hg
comparison tests/test-obsmarkers-effectflag.t @ 34415:51aadc0d0da2
effectflag: detect when description changed
Store in effect flag when the description changed between the predecessor and
its successors.
It can happens with "hg commit --amend -e", "hg amend -e" or "histedit".
Differential Revision: https://phab.mercurial-scm.org/D535
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Thu, 06 Jul 2017 14:52:34 +0200 |
parents | 468646386e95 |
children | 55ef17ec8e59 |
comparison
equal
deleted
inserted
replaced
34414:468646386e95 | 34415:51aadc0d0da2 |
---|---|
27 $ hg commit --amend -m "A1" | 27 $ hg commit --amend -m "A1" |
28 | 28 |
29 check result | 29 check result |
30 | 30 |
31 $ hg debugobsolete --rev . | 31 $ hg debugobsolete --rev . |
32 471f378eab4c5e25f6c77f785b27c936efb22874 fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'amend', 'user': 'test'} | 32 471f378eab4c5e25f6c77f785b27c936efb22874 fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} |
33 | 33 |
34 amend touching the user only | 34 amend touching the user only |
35 ---------------------------- | 35 ---------------------------- |
36 | 36 |
37 $ mkcommit B0 | 37 $ mkcommit B0 |
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': '0', 'operation': 'amend', 'user': 'test'} | 109 fad47e5bd78e6aa4db1b5a0a1751bc12563655ff a94e0fd5f1c81d969381a76eb0d37ce499a44fae 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', '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 |