Mercurial > hg > gitweb

view tests/test-confused-revert.out @ 3619:8c4fd0de5de8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix up parent display in logging For changesets with a first parent nullid, but not rev 0, we ought to display a null parent.
author Matt Mackall <mpm@selenic.com>
date Tue, 07 Nov 2006 14:04:15 -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