Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-confused-revert.out @ 2197:5de8b44f0446

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
define standard name for base url to use when printing hgweb urls. useful for bugzilla integration, email notifications, other stuffs.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Thu, 04 May 2006 11:32:00 -0700
parents b2ae81a7df29
children 6c6c0e5595a2
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
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
merging a
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
%%% 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