tests/test-merge5.out
author Nicolas Dumazet <nicdumz.commits@gmail.com>
Mon, 04 May 2009 17:11:49 +0900
changeset 8322 3c6c21eb3416
parent 6381 0b89315d5de2
child 9717 68a1b9d0663e
permissions -rw-r--r--
inotify: inotify.server.walkrepodirs() simplify walking Do not 'yield tuple, boolean' to filter later on the boolean. Test the boolean first, and yield tuple only if needed.

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
created new head
% should abort
abort: crosses branches (use 'hg merge' or 'hg update -C' to discard changes)
% should succeed
abort: crosses branches (use 'hg merge' or 'hg update -C')