tests/test-merge4.out

inotify: proper fix for issue1542 (partially reverting 67e59a9886d5)

issue1542 description:
Unknown files (?) placed in a directory are still marked as present and unknown
when the containing directory is moved out of the repository scope.

Why 67e59a9886d5 was bad:
* When the problem we're addressing only deals with unknown files, the fix to
  updatestatus applies for all statuses
* The only reason to move the call schedule_work(wpath, 'd') seems to be that
  it allowed an updatestatus call on the deleted directory, in deleted(). But
  deleted() should not be called on directories in the first place.
* After fixing an independant issue (1371), test-inotify-issue1542 was failing

Fix:
When processing a deletion of a directory, walk the tree of the unknown files
and remove the entries from repowatcher.
This step does not need to be added in the generic scan() routine: it is only
necessary on a directory deletion.

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)