Mercurial > hg
view tests/test-confused-revert.out @ 2182:4e35843b2683
Corrected test output for deprecated addremove command.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Wed, 03 May 2006 10:18:52 +0200 |
parents | b2ae81a7df29 |
children | 6c6c0e5595a2 |
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 reverting... undeleting a forgetting b %%% should show b unknown and a marked modified (merged) ? b %%% should show foo-b foo-b