Mercurial > hg

view tests/test-inotify-issue1208.out @ 11353:f2b25e8ea6c1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: when current branch has 1 or > 2 heads, actually abort. Currently merge just prints abort-like messages to stderr and then exits with a misleading status 0 (cleverly disguised as "False"). With this change it raises Abort, just like every other fatal error.
author Greg Ward <greg-hg@gerg.ca>
date Mon, 14 Jun 2010 16:06:52 -0400
parents 9501cde4c034
children
line wrap: on
line source

% fail
abort: inotify-server: cannot start: .hg/inotify.sock is a broken symlink
inotify-client: could not start inotify server: child process failed to start
abort: inotify-server: cannot start: .hg/inotify.sock is a broken symlink
% inserve
% status
? hg.pid