Mercurial > hg
view tests/test-confused-revert.out @ 4450:8fa54b9c6c5a
accept -r REV in more places
Commands affected:
* update
* merge
* backout
author | Daniel Holth <dholth@fastmail.fm> |
---|---|
date | Thu, 17 May 2007 13:55:24 -0400 |
parents | 25857e00af8e |
children | 53cbb33e1269 |
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