Mercurial > evolve

comparison tests/test-evolve-effectflags.t @ 3105:f5d472b7e800 mercurial-4.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: revert output changes related to temporary amend commit This backed out changeset 06844693bb21 and other related changes.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 20 Oct 2017 19:32:18 +0200
parents 13cafb250c1a
children 9c9c8c1eeb93 9f900937c198
comparison
equal deleted inserted replaced
3104:3dd5a6f83f8b 3105:f5d472b7e800
102 $ hg amend 102 $ hg amend
103 103
104 check result 104 check result
105 105
106 $ hg debugobsolete --rev . 106 $ hg debugobsolete --rev .
107 4d1430a201c1ffbd8465dec75edd4a691a2d97ec 0 {bd3db8264ceebf1966319f5df3be7aac6acd1a8e} (*) {'ef1': '0', 'user': 'test'} (glob)
107 bd3db8264ceebf1966319f5df3be7aac6acd1a8e 14a01456e0574f0e0a0b15b2345486a6364a8d79 0 (*) {'ef1': '64', 'user': 'test'} (glob) 108 bd3db8264ceebf1966319f5df3be7aac6acd1a8e 14a01456e0574f0e0a0b15b2345486a6364a8d79 0 (*) {'ef1': '64', 'user': 'test'} (glob)
108 $ hg obslog . 109 $ hg obslog .
109 @ 14a01456e057 (8) B2 110 @ 14a01456e057 (9) B2
110 | 111 |
111 x bd3db8264cee (7) B2 112 x bd3db8264cee (7) B2
112 rewritten(branch) as 14a01456e057 by test (*) (glob) 113 rewritten(branch) as 14a01456e057 by test (*) (glob)
113 114
114 $ hg log --hidden -r "bd3db8264cee" 115 $ hg log --hidden -r "bd3db8264cee"
126 ----------------------- 127 -----------------------
127 128
128 $ mkcommit C0 129 $ mkcommit C0
129 $ mkcommit D0 130 $ mkcommit D0
130 $ hg rebase -r . -d 'desc(B0)' 131 $ hg rebase -r . -d 'desc(B0)'
131 rebasing 10:c85eff83a034 "D0" (tip) 132 rebasing 11:c85eff83a034 "D0" (tip)
132 133
133 check result 134 check result
134 135
135 $ hg debugobsolete --rev . 136 $ hg debugobsolete --rev .
136 c85eff83a0340efd9da52b806a94c350222f3371 da86aa2f19a30d6686b15cae15c7b6c908ec9699 0 (*) {'ef1': '4', 'user': 'test'} (glob) 137 c85eff83a0340efd9da52b806a94c350222f3371 da86aa2f19a30d6686b15cae15c7b6c908ec9699 0 (*) {'ef1': '4', 'user': 'test'} (glob)
137 $ hg obslog . 138 $ hg obslog .
138 @ da86aa2f19a3 (11) D0 139 @ da86aa2f19a3 (12) D0
139 | 140 |
140 x c85eff83a034 (10) D0 141 x c85eff83a034 (11) D0
141 rewritten(parent) as da86aa2f19a3 by test (*) (glob) 142 rewritten(parent) as da86aa2f19a3 by test (*) (glob)
142 143
143 $ hg log --hidden -r "c85eff83a034" 144 $ hg log --hidden -r "c85eff83a034"
144 changeset: 10:c85eff83a034 145 changeset: 11:c85eff83a034
145 user: test 146 user: test
146 date: Thu Jan 01 00:00:00 1970 +0000 147 date: Thu Jan 01 00:00:00 1970 +0000
147 obsolete: rebased as da86aa2f19a3 148 obsolete: rebased as da86aa2f19a3
148 summary: D0 149 summary: D0
149 150
156 $ hg amend 157 $ hg amend
157 158
158 check result 159 check result
159 160
160 $ hg debugobsolete --rev . 161 $ hg debugobsolete --rev .
162 d6f4d8b8d3c8cde990f13915bced7f92ce1cc54f 0 {ebfe0333e0d96f68a917afd97c0a0af87f1c3b5f} (*) {'ef1': '0', 'user': 'test'} (glob)
161 ebfe0333e0d96f68a917afd97c0a0af87f1c3b5f 75781fdbdbf58a987516b00c980bccda1e9ae588 0 (*) {'ef1': '8', 'user': 'test'} (glob) 163 ebfe0333e0d96f68a917afd97c0a0af87f1c3b5f 75781fdbdbf58a987516b00c980bccda1e9ae588 0 (*) {'ef1': '8', 'user': 'test'} (glob)
162 $ hg obslog . 164 $ hg obslog .
163 @ 75781fdbdbf5 (13) E0 165 @ 75781fdbdbf5 (15) E0
164 | 166 |
165 x ebfe0333e0d9 (12) E0 167 x ebfe0333e0d9 (13) E0
166 rewritten(content) as 75781fdbdbf5 by test (*) (glob) 168 rewritten(content) as 75781fdbdbf5 by test (*) (glob)
167 169
168 $ hg log --hidden -r "ebfe0333e0d9" 170 $ hg log --hidden -r "ebfe0333e0d9"
169 changeset: 12:ebfe0333e0d9 171 changeset: 13:ebfe0333e0d9
170 user: test 172 user: test
171 date: Thu Jan 01 00:00:00 1970 +0000 173 date: Thu Jan 01 00:00:00 1970 +0000
172 obsolete: amended as 75781fdbdbf5 174 obsolete: amended as 75781fdbdbf5
173 summary: E0 175 summary: E0
174 176
182 $ hg amend -m F1 -u "bob <bob@bob.com>" -d "42 0" 184 $ hg amend -m F1 -u "bob <bob@bob.com>" -d "42 0"
183 185
184 check result 186 check result
185 187
186 $ hg debugobsolete --rev . 188 $ hg debugobsolete --rev .
189 3b12912003b4e7aa6df6cded86255006c3c29d27 0 {fad47e5bd78e6aa4db1b5a0a1751bc12563655ff} (*) {'ef1': '0', 'user': 'test'} (glob)
187 fad47e5bd78e6aa4db1b5a0a1751bc12563655ff a94e0fd5f1c81d969381a76eb0d37ce499a44fae 0 (*) {'ef1': '113', 'user': 'test'} (glob) 190 fad47e5bd78e6aa4db1b5a0a1751bc12563655ff a94e0fd5f1c81d969381a76eb0d37ce499a44fae 0 (*) {'ef1': '113', 'user': 'test'} (glob)
188 $ hg obslog . 191 $ hg obslog .
189 @ a94e0fd5f1c8 (15) F1 192 @ a94e0fd5f1c8 (18) F1
190 | 193 |
191 x fad47e5bd78e (14) F0 194 x fad47e5bd78e (16) F0
192 rewritten(description, user, date, branch) as a94e0fd5f1c8 by test (*) (glob) 195 rewritten(description, user, date, branch) as a94e0fd5f1c8 by test (*) (glob)
193 196
194 $ hg log --hidden -r "fad47e5bd78e" 197 $ hg log --hidden -r "fad47e5bd78e"
195 changeset: 14:fad47e5bd78e 198 changeset: 16:fad47e5bd78e
196 user: test 199 user: test
197 date: Thu Jan 01 00:00:00 1970 +0000 200 date: Thu Jan 01 00:00:00 1970 +0000
198 obsolete: rewritten as a94e0fd5f1c8 201 obsolete: rewritten as a94e0fd5f1c8
199 summary: F0 202 summary: F0
200 203
236 > 10 239 > 10
237 > EOF 240 > EOF
238 $ hg commit -m "H2" 241 $ hg commit -m "H2"
239 created new head 242 created new head
240 $ hg rebase -s "desc(H1)" -d "desc(H2)" -t :merge3 243 $ hg rebase -s "desc(H1)" -d "desc(H2)" -t :merge3
241 rebasing 17:b57fed8d8322 "H1" 244 rebasing 20:b57fed8d8322 "H1"
242 merging H0 245 merging H0
243 $ hg obslog tip 246 $ hg obslog tip
244 o e509e2eb3df5 (19) H1 247 o e509e2eb3df5 (22) H1
245 | 248 |
246 x b57fed8d8322 (17) H1 249 x b57fed8d8322 (20) H1
247 rewritten(parent) as e509e2eb3df5 by test (*) (glob) 250 rewritten(parent) as e509e2eb3df5 by test (*) (glob)
248 251
249 $ hg log --hidden -r "b57fed8d8322" 252 $ hg log --hidden -r "b57fed8d8322"
250 changeset: 17:b57fed8d8322 253 changeset: 20:b57fed8d8322
251 branch: my-other-branch 254 branch: my-other-branch
252 user: test 255 user: test
253 date: Thu Jan 01 00:00:00 1970 +0000 256 date: Thu Jan 01 00:00:00 1970 +0000
254 obsolete: rebased as e509e2eb3df5 257 obsolete: rebased as e509e2eb3df5
255 summary: H1 258 summary: H1
264 $ hg commit --amend --close-branch 267 $ hg commit --amend --close-branch
265 268
266 check result 269 check result
267 270
268 $ hg obslog . 271 $ hg obslog .
269 @ 12c6238b5e37 (22) I0 272 @ 12c6238b5e37 (26) I0
270 | 273 |
271 x 2f599e54c1c6 (21) I0 274 x 2f599e54c1c6 (24) I0
272 rewritten(meta) as 12c6238b5e37 by test (*) (glob) 275 rewritten(meta) as 12c6238b5e37 by test (*) (glob)
273 276
274 $ hg log --hidden -r "2f599e54c1c6" 277 $ hg log --hidden -r "2f599e54c1c6"
275 changeset: 21:2f599e54c1c6 278 changeset: 24:2f599e54c1c6
276 branch: closedbranch 279 branch: closedbranch
277 user: test 280 user: test
278 date: Thu Jan 01 00:00:00 1970 +0000 281 date: Thu Jan 01 00:00:00 1970 +0000
279 obsolete: meta-changed as 12c6238b5e37 282 obsolete: meta-changed as 12c6238b5e37
280 summary: I0 283 summary: I0