Mercurial > evolve

comparison tests/test-drop.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
comparison
equal deleted inserted replaced
2928:6275808e89ef 2929:06844693bb21
176 $ hg phase --force --draft 2 176 $ hg phase --force --draft 2
177 $ echo babar >> child 177 $ echo babar >> child
178 $ hg commit --amend 178 $ hg commit --amend
179 $ summary 179 $ summary
180 ============ graph ============== 180 ============ graph ==============
181 @ changeset: 4:a2c06c884bfe 181 @ changeset: 3:a2c06c884bfe
182 | tag: tip 182 | tag: tip
183 | parent: 1:19509a42b0d0 183 | parent: 1:19509a42b0d0
184 | user: test 184 | user: test
185 | date: Thu Jan 01 00:00:00 1970 +0000 185 | date: Thu Jan 01 00:00:00 1970 +0000
186 | summary: add child 186 | summary: add child
194 user: test 194 user: test
195 date: Thu Jan 01 00:00:00 1970 +0000 195 date: Thu Jan 01 00:00:00 1970 +0000
196 summary: add base 196 summary: add base
197 197
198 ============ hidden ============= 198 ============ hidden =============
199 @ changeset: 4:a2c06c884bfe 199 @ changeset: 3:a2c06c884bfe
200 | tag: tip 200 | tag: tip
201 | parent: 1:19509a42b0d0 201 | parent: 1:19509a42b0d0
202 | user: test 202 | user: test
203 | date: Thu Jan 01 00:00:00 1970 +0000 203 | date: Thu Jan 01 00:00:00 1970 +0000
204 | summary: add child 204 | summary: add child
205 | 205 |
206 | x changeset: 3:87ea30a976fd
207 | | user: test
208 | | date: Thu Jan 01 00:00:00 1970 +0000
209 | | obsolete: pruned
210 | | summary: temporary amend commit for 34b6c051bf1f
211 | |
212 | x changeset: 2:34b6c051bf1f 206 | x changeset: 2:34b6c051bf1f
213 |/ user: test 207 |/ user: test
214 | date: Thu Jan 01 00:00:00 1970 +0000 208 | date: Thu Jan 01 00:00:00 1970 +0000
215 | obsolete: amended as a2c06c884bfe 209 | obsolete: amended as a2c06c884bfe
216 | summary: add child 210 | summary: add child
225 date: Thu Jan 01 00:00:00 1970 +0000 219 date: Thu Jan 01 00:00:00 1970 +0000
226 summary: add base 220 summary: add base
227 221
228 ============ obsmark ============ 222 ============ obsmark ============
229 34b6c051bf1f78db6aef400776de5cb964470207 a2c06c884bfe53d3840026248bd8a7eafa152df8 0 (*) {'ef1': '*', 'user': 'test'} (glob) 223 34b6c051bf1f78db6aef400776de5cb964470207 a2c06c884bfe53d3840026248bd8a7eafa152df8 0 (*) {'ef1': '*', 'user': 'test'} (glob)
230 87ea30a976fdf235bf096f04899cb02a903873e2 0 {34b6c051bf1f78db6aef400776de5cb964470207} (*) {'ef1': '*', 'user': 'test'} (glob)
231 $ hg drop . 224 $ hg drop .
232 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 225 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
233 working directory now at 19509a42b0d0 226 working directory now at 19509a42b0d0
234 search obsmarker: wall * comb * user * sys * (glob) 227 search obsmarker: wall * comb * user * sys * (glob)
235 1 obsmarkers found 228 1 obsmarkers found