Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-confused-revert.out @ 2971:63c3a1921a67
Add ui.strict config item.
This turns off command matching by unambiguous prefix, and is a good
thing if you want to write future-proof scripts.
This fixes issue 314.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon, 21 Aug 2006 21:59:29 -0700 |
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