Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-confused-revert.out @ 2027:94d3170399e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
work around python bug on solaris 10. write to file opened mode 'a+' should write to end of file and update offset pointer, but does not (solaris 10 has python 2.3.3). fix is to always seek.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Thu, 30 Mar 2006 19:28:41 -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