Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-confused-revert.out @ 3875:729f354f3f09

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
zsh: better fix for partial completions Properly handle relative paths followed by partial filenames hg add ../path/to/file/partial[TAB]
author Steve Borho <steve@borho.org>
date Tue, 12 Dec 2006 15:34:11 -0600
parents 25857e00af8e
children
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
%%% revert should fail
abort: uncommitted merge - please provide a specific revision
%%% revert should be ok now
undeleting a
forgetting b
%%% should show b unknown and a marked modified (merged)
? b
%%% should show foo-b
foo-b