Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-confused-revert.out @ 1718:c1996b84d4f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make hook code nicer. pre hooks can raise exception if fail. tidy up better if exception raised (like KeyboardInterrupt) when running hook program.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Tue, 14 Feb 2006 15:28:06 -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