Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-confused-revert.out @ 2109:1b183976e007

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert push new heads logic This breaks push -r's new head detection but fixes the common case. For now we'll assume that someone doing push -r knows what they're doing.
author Matt Mackall <mpm@selenic.com>
date Fri, 21 Apr 2006 16:30:23 -0500
parents 968f036f93a4
children b2ae81a7df29
line wrap: on
line source

%%% should show a removed and b added
A b
R a
reverting...
undeleting a
forgetting b
%%% 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...
undeleting a
forgetting b
%%% should show b unknown and a marked modified (merged)
? b
%%% should show foo-b
foo-b