When manually resolving directory conflicts isn't a feature

[Martin Pool]

2009/4/8 Aaron Bentley <aaron at aaronbentley.com>:

> There is a genuine conflict.  Some users will want the directory and its
> contents to be deleted.  Others may want the directory to be deleted and
> its contents moved elsewhere.  Others may want the directory to be
> unversioned and its contents retained.  Others may want the directory
> and its contents to be untouched.
>
> A conflict means that we don't know what to do.
>
> Conflict resolution policies are already loosely coupled to
> TreeTransforms-- we have one for checkout, and one that's used for
> everything else.  It's easy to imagine letting users configure a policy
> that's more suited for their particular project, such as deleting
> unversioned children of directories being deleted.
>
> We can also pursue classifying files as "junk", which would be a more
> general solution, but would make the user model more complex.

I've seen a similar problem when bzr or other python projects have
removed or renamed directories containing ignored *.pyc files.  In
fact a pretty large section of users will have ignored files (*~, *.o,
*.class) in source directories and therefore will eventually be bitten
by this if they move or delete those directories.