Comment 10 for bug 322767
Revision history for this message
| Martin Pool (mbp) wrote Re: [Bug 322767] Re: MYSQL/BZR - P3: How to avoid that people commit .OTHER/.BASE/.THIS/.moved files? | #10 |
© 2004
Canonical Ltd.
•
Terms of use
•
Data privacy
•
Contact Launchpad Support
•
Blog
•
Careers
•
System status
•
35a32c5
(Get the code!)
2009/7/16 Aaron Bentley <email address hidden>:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Martin Pool wrote:
>> No, I didn't think of that case. Thanks for explaining it, John.
>>
>> This seems like one of those bugs for which you can do either a
>> smaller or a larger (longer) fix, so I'd like to work out now what
>> Guilhem wants. The small fix he originally requested is to block adds
>> of ignored files.
>
> I wouldn't like that much. If someone specifies that they want to add
> an ignored file, why shouldn't we? They have to manually specify it,
> (or use a wildcard) after all. A warning would be fine, but if we can
> do what the user asks, I think we should.
It is question that comes up a bit when less-advanced users seem to
run into trouble. I've probably seen "why did that happen" 10+ times
on the list or irc. So you could make a case that it should be
disabled by default and then advanced users can say --no-really.
However, after the rest of the discussion of this bug, it seems that
change would not really fix the problem, so I'm not suggesting we do
it now. The problem seems to be more to do with how tree shape
conflicts are reported and handled.
--
Martin <http://