Mercurial > evolve

comparison tests/test-uncommit.t @ 1759:e878999e6af4 mercurial-3.8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with latest fix
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Sat, 29 Oct 2016 14:49:37 +0200
parents b0a67ebc464e a7dcfff8c4a9
children 6d54fd20bb81 2be05515b142
comparison
equal deleted inserted replaced
1747:b0a67ebc464e 1759:e878999e6af4
238 238
239 $ hg up -C 3 --hidden 239 $ hg up -C 3 --hidden
240 8 files updated, 0 files merged, 1 files removed, 0 files unresolved 240 8 files updated, 0 files merged, 1 files removed, 0 files unresolved
241 (leaving bookmark touncommit-bm) 241 (leaving bookmark touncommit-bm)
242 working directory parent is obsolete! 242 working directory parent is obsolete!
243 (use "hg evolve" to update to its successor) 243 (use 'hg evolve' to update to its successor)
244 $ hg --config extensions.purge= purge 244 $ hg --config extensions.purge= purge
245 $ hg uncommit -I 'set:added() and e' 245 $ hg uncommit -I 'set:added() and e'
246 2 new divergent changesets 246 2 new divergent changesets
247 $ hg st --copies 247 $ hg st --copies
248 A e 248 A e
283 Test --all 283 Test --all
284 284
285 $ hg up -C 3 --hidden 285 $ hg up -C 3 --hidden
286 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 286 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
287 working directory parent is obsolete! 287 working directory parent is obsolete!
288 (use "hg evolve" to update to its successor) 288 (use 'hg evolve' to update to its successor)
289 $ hg --config extensions.purge= purge 289 $ hg --config extensions.purge= purge
290 $ hg uncommit --all -X e 290 $ hg uncommit --all -X e
291 1 new divergent changesets 291 1 new divergent changesets
292 $ hg st --copies 292 $ hg st --copies
293 M b 293 M b
317 317
318 Display a warning if nothing left 318 Display a warning if nothing left
319 319
320 $ hg uncommit e 320 $ hg uncommit e
321 new changeset is empty 321 new changeset is empty
322 (use "hg prune ." to remove it) 322 (use 'hg prune .' to remove it)
323 $ hg debugobsolete 323 $ hg debugobsolete
324 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (*) {'user': 'test'} (glob) 324 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (*) {'user': 'test'} (glob)
325 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c706fe2c12f83ba5010cb60ea6af3bd1f0c2d6d3 0 (*) {'user': 'test'} (glob) 325 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c706fe2c12f83ba5010cb60ea6af3bd1f0c2d6d3 0 (*) {'user': 'test'} (glob)
326 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c4cbebac3751269bdf12d1466deabcc78521d272 0 (*) {'user': 'test'} (glob) 326 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c4cbebac3751269bdf12d1466deabcc78521d272 0 (*) {'user': 'test'} (glob)
327 c4cbebac3751269bdf12d1466deabcc78521d272 4f1c269eab68720f54e88ce3c1dc02b2858b6b89 0 (*) {'user': 'test'} (glob) 327 c4cbebac3751269bdf12d1466deabcc78521d272 4f1c269eab68720f54e88ce3c1dc02b2858b6b89 0 (*) {'user': 'test'} (glob)