Mercurial > evolve

comparison tests/test-prune.t @ 931:32915143d448 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
prune: update to successor rather than parent when prune '.'
author Dan Villiom Podlaski Christiansen <dan@cabo.dk>
date Thu, 09 Jan 2014 11:33:15 +0100
parents 69872cef6053
children bcd0c12070b2
comparison
equal deleted inserted replaced
930:cac35bef8aee 931:32915143d448
113 o 0:1f0dee641bb7[BABAR] (stable/public) add a 113 o 0:1f0dee641bb7[BABAR] (stable/public) add a
114 114
115 115
116 one old, one new 116 one old, one new
117 117
118 $ hg up 'desc("add ee")'
119 4 files updated, 0 files merged, 4 files removed, 0 files unresolved
118 $ hg prune 'desc("add ee")' -s 'desc("add nE")' 120 $ hg prune 'desc("add ee")' -s 'desc("add nE")'
119 1 changesets pruned 121 1 changesets pruned
122 4 files updated, 0 files merged, 4 files removed, 0 files unresolved
123 working directory now at 6e8148413dd5
120 $ hg debugobsolete 124 $ hg debugobsolete
121 9d206ffc875e1bc304590549be293be36821e66c 0 {'date': '314064000 0', 'user': 'blah'} (glob) 125 9d206ffc875e1bc304590549be293be36821e66c 0 {'date': '314064000 0', 'user': 'blah'} (glob)
122 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {'date': '*', 'user': 'test'} (glob) 126 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {'date': '*', 'user': 'test'} (glob)
123 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {'date': '*', 'user': 'test'} (glob) 127 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {'date': '*', 'user': 'test'} (glob)
124 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {'date': '*', 'user': 'test'} (glob) 128 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {'date': '*', 'user': 'test'} (glob)
255 bookmark 'delete' deleted 259 bookmark 'delete' deleted
256 $ hg tag --remove --local c 260 $ hg tag --remove --local c
257 $ hg id -ir 6:2702dd0c91e7 261 $ hg id -ir 6:2702dd0c91e7
258 abort: unknown revision '2702dd0c91e7'! 262 abort: unknown revision '2702dd0c91e7'!
259 [255] 263 [255]
260