view tests/test-merge-force.out @ 8551:7089d9727867

inotify: modular architecture for inotify clients Put the socket init, query generation and response analysis in a more generic client class.
author Nicolas Dumazet <nicdumz.commits@gmail.com>
date Tue, 07 Apr 2009 18:39:34 +0900
parents 3682a19bb637
children
line wrap: on
line source

created new head
% local deleted a file, remote removed
abort: outstanding uncommitted changes (use 'hg status' to list changes)
resolving manifests
removing a
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% should show a as removed
R a
% manifest. should not have a:
b