Comment 3 for bug 403137

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

Martin Albisetti wrote:
> I think the general feeling is right, but I'm not sure what the best way
> to solve this is.
>
> ** Changed in: bzr
> Importance: Undecided => Wishlist
>
> ** Changed in: bzr
> Status: New => Triaged
>

I can delete an ignore that you modify.

I can modify an ignore that you modify.

There are lots of ways that .bzrignore *could* conflict that are genuine
conflicts.

I can understand that in a common case of 2 people adding an ignore it
is unclear. One could argue that you should always add both. However, it
is also possible that 2 people solved the ignore issue in different ways.

For example, if I added:
  *.pyc

And you added
  *.py[co]

Which is 'better'? The latter ignores everything the former does, so it
seems a bit silly to have both.

Anyway, we could certainly do better about merging .bzrignore in a
*logical* fashion, rather than a *textual* fashion. But that doesn't
mean that real-world *logical* changes can't conflict.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkpnU2wACgkQJdeBCYSNAAP61ACdHxDiSGkgYPiUme4Jt2hVpsbN
KAQAoKXFO6r35ee3GbOsd0tIyKjfUCH1
=Zm3c
-----END PGP SIGNATURE-----