annotate tests/test-add.out @ 8335:713ec3f9c9de

inotify: Clarify the use of "watcher" name.

Currently, Watcher is a class in inotify.linux.watcher, but it's also a class
in inotify.server . To complicate things further more, the latter has a
'watcher' attribute, an instance of the former class.

When it comes to the 'watcher' attribute of the Server class in inotify.server,
one can get quite confused: is it a Watcher object from inotify.server, or from
inotify.linux.watcher?

Changes:
* in inotify.linux.watcher : nothing
* in inotify.server :
    ** Watcher class is renamed to RepoWatcher
    ** server.watcher is renamed to server.repowatcher

adding a
? a
adding a
A a
A a
? b
A a
A b
% should fail
b already tracked!
A a
A b
% should fail
a already tracked!
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
merging a
warning: conflicts during merge.
merging a failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
M a
? a.orig
% should fail
a already tracked!
M a
? a.orig
% issue683
R a
? a.orig
M a
? a.orig
c does not exist!
d does not exist!
M a
A c
? a.orig