Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-confused-revert.out @ 1591:5a3229cf1492

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
do not copy atime and mtime in util.copyfiles it is unsupported on some fs (vfat) and we don't need to copy it one clone anyway
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Fri, 16 Dec 2005 01:32:44 -0600
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