Ignored files are not detected properly

lassik commented 10 years ago

Set up two connections Such that there's a directory that contains nothing but a regular file named .DS_Store in one connection, and that directory doesn't exist in the other connection.

The .DS_Store file is not displayed in the Merge treeview -> this is correct.

Decide that the connection where the directory doesn't exist is the winner for that directory. Press Merge.

A DeleteEmptyDir operation is created for that directory -> correct.
BUT: No DeleteFile operation for the .DS_Store -> BUG

Expected behavior: there should be a DeleteFile op for the .DS_Store just before the DeleteEmptyDir op in the operation list.

Bitbucket: https://bitbucket.org/lassi/mergedotnet/issue/3
Originally Reported By: Lassi Kortela
Originally Created At: 2014-09-19T12:20:08.660

lassik commented 10 years ago

Fix bug #3: Ignored files are not detected properly

→ <<cset 3fc588dbff9e>>

Original Comment By: Lassi Kortela

lassik commented 10 years ago

The code seems to add the .DS_Store file to its own ignored-file-set. Should be added to the containing directory's ignored-file-set instead.

Original Comment By: Lassi Kortela

lassik / mergedotnet

Ignored files are not detected properly #3