Mercurial > hg > pyhgsh

view tests/test-confused-revert.out @ 2081:416d8b2a75b8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Speedup revlog.ancestors for the linear case revlog.ancestors can be expensive on big repos. This cuts down the overall time for hg update by ~19% by short cutting revlog.ancestors when one of the revisions is reachable from another.
author Chris Mason <mason@suse.com>
date Thu, 06 Apr 2006 20:13:09 -0400
parents a514c7509fa9
children 968f036f93a4
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
? b.orig
merging a
%%% should show foo-b
foo-b
%%% should show a removed and b added
A b
R a
? b.orig
reverting...
undeleting a
forgetting b
%%% should show b unknown and a marked modified (merged)
? b
? b.orig
%%% should show foo-b
foo-b