Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-confused-revert.out @ 2961:5bb65c3945a3
localrepo.status: detect clean files even when the mtime has changed
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Sun, 20 Aug 2006 00:44:54 -0300 |
parents | 6c6c0e5595a2 |
children | 25857e00af8e |
line wrap: on
line source
%%% should show a removed and b added A b R a reverting... undeleting a forgetting b %%% should show b unknown and a back to normal ? b 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved merging a 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) %%% should show foo-b foo-b %%% should show a removed and b added A b R a %%% revert should fail abort: working dir has two parents; you must specify the revision to revert to %%% revert should be ok now undeleting a forgetting b %%% should show b unknown and a marked modified (merged) ? b %%% should show foo-b foo-b