Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-confused-revert.out @ 2024:6328445b0e71

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixes to testpid() for Windows. Handle processes that no longer exist and processes that belong to another user. Enables the lock breaking changes from d314a89fa4f1 and subsequently "fixes" the left over locks reported in bug 112.
author Lee Cantey <lcantey@gmail.com>
date Thu, 30 Mar 2006 18:20:08 -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