equal
deleted
inserted
replaced
49 $ hg commit --amend -d "42 0" |
49 $ hg commit --amend -d "42 0" |
50 |
50 |
51 check result |
51 check result |
52 |
52 |
53 $ hg debugobsolete --rev . |
53 $ hg debugobsolete --rev . |
54 2ef0680ff45038ac28c9f1ff3644341f54487280 4dd84345082e9e5291c2e6b3f335bbf8bf389378 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'amend', 'user': 'test'} |
54 2ef0680ff45038ac28c9f1ff3644341f54487280 4dd84345082e9e5291c2e6b3f335bbf8bf389378 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '32', 'operation': 'amend', 'user': 'test'} |
55 |
55 |
56 amend touching the branch only |
56 amend touching the branch only |
57 ---------------------------- |
57 ---------------------------- |
58 |
58 |
59 $ mkcommit B2 |
59 $ mkcommit B2 |
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': '17', 'operation': 'amend', 'user': 'test'} |
109 fad47e5bd78e6aa4db1b5a0a1751bc12563655ff a94e0fd5f1c81d969381a76eb0d37ce499a44fae 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '49', '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 |