Mercurial > hg > gitweb
view tests/test-confused-revert.out @ 3080:e270cbd4aa20
Fixed OSError "No such file or directory: None" and make IOError consistent.
The None error occurs when the current working directory is no longer
available, e.g. because it was removed in another shell.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Mon, 11 Sep 2006 10:23:23 +0200 |
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