Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-confused-revert.out @ 2209:956e329f9e13

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
document hgignore syntax in new file doc/hgignore.5.txt. fix issue 162.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Thu, 04 May 2006 22:20:02 -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