Mercurial > hg
view tests/test-confused-revert.out @ 6673:16d2d093d1dd
update: improved help text
Using the term "the repository's working directory" instead of just "working
directory" to make it nearly impossible to confuse it with $PWD.
Also, this new wording better conveys the fact that update applies
to the working dir as a whole (no matter what the $PWD currently is).
author | Adrian Buehlmann <adrian@cadifra.com> |
---|---|
date | Wed, 11 Jun 2008 13:51:57 +0200 |
parents | 4b0c9c674707 |
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 created new head 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) M a ? b %%% should show foo-b foo-b