[MERGE] no default ignores

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Robert Collins wrote:

> If .bzrignore is present by default, and added by default, we
> now have two trees created by 'bzr init' not being equal, or having a
> known, fixed id.

This is true, but it's a direction we were already going in, with
support for root ids other than TREE_ROOT.

> If its not added by default then the commit step will show an unknown
> file which may surprise people. 

I agree that would be bad.

> Neither seems particularly nice. Including any rules in the users tree,
> with a versioned file controlling them seems fragile to me, and I'd much
> prefer the versioned-data approach here too.

I'd prefer versioned-data, but I'd prefer versioned-file to nothing.

> If I have a tree with .bzrignore containing
> ===
> # ignore format 2
> rules here
> ===
> 
> Old clients will end up with even more rules than desirable, because of
> the doubling of whatever rules people have included, and users of those
> trees with older bzr will not add in the rules that are needed to ignore
> files they see as automatically ignored in newer clients.

This is true whether or not we bump the version.

The advantage of bumping the version, as I see it, is it gives people
time to ensure that everyone upgrades, before switching to the new
semantics.  This will avoid the situation where some clients have
repeated patterns, because no one will have old clients at this point.

>  * I'd much rather have no default rules than some defaults, if only so
> that there is no pressure to grow the list - its easier to say 'we dont
> do defaults', than to say 'no Timmy, .foo cannot be a default' over and
> over again.

I think "bzr init --defaults minimal" becomes an "unbreak me" option, if
we do that.  I know I will always want it, so I will include it in my
aliases.  And I think that any option which is usually supplied deserves
serious consideration as a default.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFEjYYz0F+nu1YWqI0RAskHAJ0SXJ1nIJMTIjnulEFq+VVYtnYboQCdEswh
59w9Zg9aKHcbtr0ZDWXHxHc=
=jQxv
-----END PGP SIGNATURE-----