Mercurial > hg
view tests/test-convert-darcs.out @ 7329:fd4bf5269733
Do not abort with inotify extension enabled, but not supported by the system.
And remove the "native support is required" message which is generated at an
inappropriate location and is printed more than once when using 'hg status'.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 07 Nov 2008 13:02:04 +0100 |
parents | f29b7c8419cb |
children | b236f34ec1e9 |
line wrap: on
line source
% initialize darcs repo Finished recording patch 'p0' % branch and update Finished recording patch 'p1.1' % update source Finished recording patch 'p1.2' % merge branch We have conflicts in the following files: ./a Finished pulling and applying. Finished recording patch 'p2' initializing destination darcs-repo-hg repository scanning source... sorting... converting... 3 p0 2 p1.2 1 p1.1 0 p2 o 3 "p2" files: a | o 2 "p1.1" files: | o 1 "p1.2" files: a b | o 0 "p0" files: a 7225b30cdf38257d5cc7780772c051b6f33e6d6b 644 a 1e88685f5ddec574a34c70af492f95b6debc8741 644 b