Comment 5 for bug 414589
Revision history for this message
| John A Meinel (jameinel) wrote Re: [Bug 414589] Re: Bazaar doesn't notice/care if you try to version-control *.THIS, *.BASE, *.OTHER or *.moved | #5 |
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Vincent Ladeuil wrote:
> @Martin: Thanks for the feedback, so indeed, there was a 'bzr add'.
>
> Marking high as it's a first line of defense against subsequent
> surprising behaviors (once the files are added, subsequent conflicts on
> the involved files become really obscure).
>
So one possibility is to add .THIS, .BASE, .OTHER to the default ignore
list.
The good and bad is that "bzr add" won't default to adding them, but
"bzr status" won't default to showing them. (You will hopefully a
conflict entry for the given file, though.)
John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://
iEYEARECAAYFAkq
5HsAn1gsHu1zoVN
=4BUN
-----END PGP SIGNATURE-----