Mercurial > hg > pyhgsh

view tests/test-confused-revert.out @ 1669:91d40fc959f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
turn patchbomb script into an extension module. command name is now 'hg email'.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Tue, 31 Jan 2006 08:06:35 -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