Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-confused-revert.out @ 4724:a084ed4b0c35
Added tag 0.9.4 for changeset fb4b6d5fe100
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 25 Jun 2007 21:18:19 -0500 |
parents | 25857e00af8e |
children |
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: uncommitted merge - please provide a specific revision %%% 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