[MERGE] Rule-based preferences (EOL part 1 of 3)

[Stefan Monnier]

> I am very shy of putting control files in the users tree; we've had bad
> experiences consistently in every VCS I have used or cut code for;
> please do explain more about why you feel they should be in the tree.

> (Yes, putting them in the branch object means we need to think about the
> impact carefully - but we need to do so regardless of where we put them)

I'm probably sounding like a broken record, but in any case I'll restate
that I think the Arch way was right:
- treat it like a normal user file (w.r.t merging, changing,
  committing, ...).
- but place it somewhere inside the .bzr directory.

The first point has the upside of making it benefit from all the usual
nice and clean semantics.  It has the downside of exposing the
representation, thus making it more painful to migrate to
something different.

Once this works, the .bzrignore can be moved acordingly.


        Stefan