Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-confused-revert.out @ 2074:01ee43dda681

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix bundle repos to use an index tuple consistent with revlogng The bundle repo code was adding a field to the index tuple, which confused the revlogng changes. This creates a new dict instead to maintain the extra bundle info.
author mason@suse.com
date Tue, 04 Apr 2006 16:38:43 -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