Re: Warn recent changes in files being deleted: does it make sense?
Stephan Bergmann <[email protected]> Thu, 08 Oct 2009 10:31:45 +0200
| Newsgroups | gmane.comp.openoffice.devel.tools |
|---|---|
| Message-ID | <[email protected]> |
On 10/06/09 14:02, Jens-Heiner Rechtien wrote: > How should any SCM detect filesystem only renames? This is just asked to > much. You have to use "hg rename", of course. Anything else would have > to rely on heuristics which might fail, hardly something a SCM can do. *Everything* an SCM does when it comes to merging changes (be it to individual files or to a complete file hierarchy) relies on heuristics and can fail. The only correct way that could never fail would be to declare "there are already changes made to the repository you want to commit to, please resolve the mess manually" and not do any automatic merging. (Not the behavior you would expect, though. Also see <http://blogs.sun.com/GullFOSS/entry/mistaking_version_control_for_collaboration>.) -Stephan