tests/test-merge-force.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Sat, 06 Sep 2008 12:49:20 +0200
changeset 6996 fecf060f32a1
parent 6336 4b0c9c674707
child 8545 3682a19bb637
permissions -rw-r--r--
inotify: deactivate inotify status on failure workaround issue1208, add test fix traceback handling (socket.error is a singleton in this case)

created new head
% local deleted a file, remote removed
abort: outstanding uncommitted 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