Mercurial > evolve

comparison tests/test-uncommit.t @ 2835:20c2499ce8bc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
log: divergent was renamed into contentdivergent Divergent was renamed into contentdivergent, update tests. Match 2194a8723138 mercurial changeset.
author Boris Feld <boris.feld@octobus.net>
date Thu, 10 Aug 2017 17:57:50 +0200
parents 554c069cdc85
children 66796d7b5415
comparison
equal deleted inserted replaced
2834:38db1466c6fb 2835:20c2499ce8bc
285 Test --all 285 Test --all
286 286
287 $ hg up -C 3 --hidden 287 $ hg up -C 3 --hidden
288 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 288 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
289 working directory parent is obsolete! (5eb72dbe0cb4) 289 working directory parent is obsolete! (5eb72dbe0cb4)
290 (5eb72dbe0cb4 has diverged, use 'hg evolve --list --divergent' to resolve the issue) 290 (5eb72dbe0cb4 has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue)
291 $ hg --config extensions.purge= purge 291 $ hg --config extensions.purge= purge
292 $ hg uncommit --all -X e 292 $ hg uncommit --all -X e
293 1 new divergent changesets 293 1 new divergent changesets
294 $ hg st --copies 294 $ hg st --copies
295 M b 295 M b