Mercurial > evolve

comparison tests/test-evolve-effectflags.t @ 2929:06844693bb21

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