Comment 5 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? | #5 |
© 2004
Canonical Ltd.
•
Terms of use
•
Data privacy
•
Contact Launchpad Support
•
Blog
•
Careers
•
System status
•
67d34a1
(Get the code!)
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. The larger work is to generally improve how shape
conflicts are generated, reported and resolved -- this would
definitely be good to do but it's nontrivial.
--
Martin <http://