Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-confused-revert.out @ 4566:9b3a818adae6
test-patchbomb: sed -e may not work with extended regexps
Non-GNU versions of the sed(1) utility (i.e. on Solaris or BSD)
may not support extended regexps (i.e. including \| branches),
or may need a special option to enable it (like -E instead of -e).
Expand the sed RE in tests/test-patchbomb to fix running this
test on FreeBSD and Solaris.
author | Giorgos Keramidas <keramida@ceid.upatras.gr> |
---|---|
date | Wed, 13 Jun 2007 15:02:09 +0300 |
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