Mercurial > evolve

comparison tests/test-drop.t @ 1067:5d063fed9e3d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: yield to relevant markers handling in core The handling of obsolescence marker is now performed in core. If we detect a mercurial with such power we skip the wrapping from evolve. This changeset also suffer from massive diff from the change in display of obsolescence marker with parent information introduced at the same time in core.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Wed, 20 Aug 2014 20:49:48 -0700
parents f355bbc124fc
children 875e671c3cd8
comparison
equal deleted inserted replaced
1066:045f7de9e4d3 1067:5d063fed9e3d
225 date: Thu Jan 01 00:00:00 1970 +0000 225 date: Thu Jan 01 00:00:00 1970 +0000
226 summary: add base 226 summary: add base
227 227
228 ============ obsmark ============ 228 ============ obsmark ============
229 34b6c051bf1f78db6aef400776de5cb964470207 a2c06c884bfe53d3840026248bd8a7eafa152df8 0 (*) {'user': 'test'} (glob) 229 34b6c051bf1f78db6aef400776de5cb964470207 a2c06c884bfe53d3840026248bd8a7eafa152df8 0 (*) {'user': 'test'} (glob)
230 87ea30a976fdf235bf096f04899cb02a903873e2 0 (*) {'p1': '34b6c051bf1f78db6aef400776de5cb964470207', 'user': 'test'} (glob) 230 87ea30a976fdf235bf096f04899cb02a903873e2 0 {34b6c051bf1f78db6aef400776de5cb964470207} (*) {'user': 'test'} (glob)
231 $ hg drop . 231 $ hg drop .
232 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 232 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
233 working directory now at 19509a42b0d0 233 working directory now at 19509a42b0d0
234 search obsmarker: wall * comb * user * sys * (glob) 234 search obsmarker: wall * comb * user * sys * (glob)
235 1 obsmarkers found 235 1 obsmarkers found
262 user: test 262 user: test
263 date: Thu Jan 01 00:00:00 1970 +0000 263 date: Thu Jan 01 00:00:00 1970 +0000
264 summary: add base 264 summary: add base
265 265
266 ============ obsmark ============ 266 ============ obsmark ============
267 87ea30a976fdf235bf096f04899cb02a903873e2 0 (*) {'p1': '34b6c051bf1f78db6aef400776de5cb964470207', 'user': 'test'} (glob) 267 87ea30a976fdf235bf096f04899cb02a903873e2 0 {34b6c051bf1f78db6aef400776de5cb964470207} (*) {'user': 'test'} (glob)