Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-confused-revert.out @ 4709:53eca35c3aeb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add option "hidden" to hgwebdir. TODO: should this option be renamed to 'hide_from_index' or maybe to 'index_ignore' (like Apache's mod_autoindex) ?
author Markus F.X.J. Oberhumer <markus@oberhumer.com>
date Mon, 25 Jun 2007 14:46:20 +0200
parents 25857e00af8e
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
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