tests/test-convert-bzr-merges.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.

% test multiple merges at once
initializing destination source-hg repository
scanning source...
sorting...
converting...
4 Initial add
3 Added branch1 file
2 Added parent file
1 Added brach2 file
0 Merged branches
o    5 "(octopus merge fixup)" files:
|\
| o    4 "Merged branches" files: file-branch2
| |\
o---+  3 "Added brach2 file" files: file-branch2
 / /
| o  2 "Added parent file" files: file-parent
| |
o |  1 "Added branch1 file" files: file file-branch1
|/
o  0 "Initial add" files: file

% manifest of tip
644   file
644   file-branch1
644   file-branch2
644   file-parent