Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-confused-revert.out @ 1747:91c56c427171

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
transitive copy/rename Add support for transitive copy or rename operations, e.g. hg rename a b ... (possibly edit b) hg rename b c hg commit ... by actually renaming "b" as "c" while recording a copy of "a" to "c" and a removal of "a".
author Robin Farine <robin.farine@terminus.org>
date Sat, 18 Feb 2006 07:37:59 -0800
parents 30146be3437c
children d436b21b20dc
line wrap: on
line source

%%% should show a removed and b added
A b
R a
reverting...
%%% should show b unknown and a back to normal
? b
merging a
%%% should show foo-b
foo-b
%%% should show a removed and b added
A b
R a
reverting...
%%% should show b unknown and a marked modified (merged)
? b
%%% should show foo-b
foo-b