Mercurial > evolve

comparison tests/test-uncommit.t @ 2546:abe6dfbdc744 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: fix typo: -list -> --list
author Kyle Lippincott <spectral@google.com>
date Tue, 06 Jun 2017 15:10:13 -0700
parents 61d073590fb7
children 3312f9404c00
comparison
equal deleted inserted replaced
2545:cb0d62ed5e2a 2546:abe6dfbdc744
284 Test --all 284 Test --all
285 285
286 $ hg up -C 3 --hidden 286 $ hg up -C 3 --hidden
287 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 287 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
288 working directory parent is obsolete! (5eb72dbe0cb4) 288 working directory parent is obsolete! (5eb72dbe0cb4)
289 (5eb72dbe0cb4 has diverged, use 'hg evolve -list --divergent' to resolve the issue) 289 (5eb72dbe0cb4 has diverged, use 'hg evolve --list --divergent' to resolve the issue)
290 $ hg --config extensions.purge= purge 290 $ hg --config extensions.purge= purge
291 $ hg uncommit --all -X e 291 $ hg uncommit --all -X e
292 1 new divergent changesets 292 1 new divergent changesets
293 $ hg st --copies 293 $ hg st --copies
294 M b 294 M b