Mercurial > evolve

comparison tests/test-uncommit.t @ 486:2111c655b4f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix typo
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Thu, 23 Aug 2012 18:00:29 +0200
parents d702f0d26c6a
children 6989d8fe4ed2
comparison
equal deleted inserted replaced
485:41bf6c27a122 486:2111c655b4f5
240 $ hg up -C 3 240 $ hg up -C 3
241 8 files updated, 0 files merged, 1 files removed, 0 files unresolved 241 8 files updated, 0 files merged, 1 files removed, 0 files unresolved
242 Working directory parent is obsolete 242 Working directory parent is obsolete
243 $ hg --config extensions.purge= purge 243 $ hg --config extensions.purge= purge
244 $ hg uncommit -I 'set:added() and e' 244 $ hg uncommit -I 'set:added() and e'
245 2 new conflictings changesets 245 2 new conflicting changesets
246 $ hg st --copies 246 $ hg st --copies
247 A e 247 A e
248 $ hg st --copies --change . 248 $ hg st --copies --change .
249 M b 249 M b
250 M d 250 M d
284 $ hg up -C 3 284 $ hg up -C 3
285 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 285 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
286 Working directory parent is obsolete 286 Working directory parent is obsolete
287 $ hg --config extensions.purge= purge 287 $ hg --config extensions.purge= purge
288 $ hg uncommit --all -X e 288 $ hg uncommit --all -X e
289 1 new conflictings changesets 289 1 new conflicting changesets
290 $ hg st --copies 290 $ hg st --copies
291 M b 291 M b
292 M d 292 M d
293 M j 293 M j
294 M o 294 M o
331 $ hg ci -Am addunrelated unrelated 331 $ hg ci -Am addunrelated unrelated
332 $ hg gdown 332 $ hg gdown
333 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 333 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
334 [8] touncommit 334 [8] touncommit
335 $ hg uncommit aa 335 $ hg uncommit aa
336 1 new unstables changesets 336 1 new unstable changesets