Mercurial Mercurial > hg > mercurial-crew-with-dirclash / file revision
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-revert.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Wed, 01 Feb 2006 08:46:24 +0100
changeset 1674 dee55c4a4963
parent 1487 2bc6cd62a29c
child 2029 d436b21b20dc
permissions -rw-r--r--
abort when using 'update -m' and this is not a merge add more testcases for updating with local changes

%% should show b unknown
? b
%% should show b unknown and c modified
M c
? b
%% should show b added and c modified
M c
A b
%% should show a removed, b added and c modified
M c
A b
R a
%% should show b added and c modified
M c
A b
%% should show b unknown and c modified
M c
? b
%% should show b unknown
? b
%% should show a b and c
a
b
c
mercurial-crew-with-dirclash