Mercurial > evolve

comparison tests/test-uncommit.t @ 1443:6c122c975125

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: add a hint when the parent working copy become obsolete This should help people find the right commands to recover from this situation.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Wed, 24 Jun 2015 16:37:02 -0700
parents 935508184d47
children 5f6e78aea094
comparison
equal deleted inserted replaced
1442:6a219f8089f9 1443:6c122c975125
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 $ hg --config extensions.purge= purge 244 $ hg --config extensions.purge= purge
244 $ hg uncommit -I 'set:added() and e' 245 $ hg uncommit -I 'set:added() and e'
245 2 new divergent changesets 246 2 new divergent changesets
246 $ hg st --copies 247 $ hg st --copies
247 A e 248 A e
282 Test --all 283 Test --all
283 284
284 $ hg up -C 3 --hidden 285 $ hg up -C 3 --hidden
285 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
286 working directory parent is obsolete! 287 working directory parent is obsolete!
288 (use "hg evolve" to update to its successor)
287 $ hg --config extensions.purge= purge 289 $ hg --config extensions.purge= purge
288 $ hg uncommit --all -X e 290 $ hg uncommit --all -X e
289 1 new divergent changesets 291 1 new divergent changesets
290 $ hg st --copies 292 $ hg st --copies
291 M b 293 M b