Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-confused-revert.out @ 2330:b30aa02c85e7
add 'uisetup' function to extension module protocol.
if uisetup functin exists in extension, is called before cmdtable examined.
called with ui object as parameter. lets module modify cmdtable before
commands.py sees it.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Sun, 21 May 2006 22:14:11 -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