Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-confused-revert.out @ 1867:91ebf29c1595

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add -f/--force to remove command. else to remove modified file, must use "hg revert; hg rm" or "rm; hg rm --after".
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Wed, 08 Mar 2006 15:14:24 -0800
parents 30146be3437c
children d436b21b20dc
line wrap: on
line source

%%% should show a removed and b added
A b
R a
reverting...
%%% should show b unknown and a back to normal
? b
merging a
%%% should show foo-b
foo-b
%%% should show a removed and b added
A b
R a
reverting...
%%% should show b unknown and a marked modified (merged)
? b
%%% should show foo-b
foo-b