On Fri, Mar 18, 2011 at 12:12 PM, John Found <[email protected]> wrote: > I have very little experience with any version control systems. > For me "least astonishment" means simply: If the file is changed by VCS, > then later, VCS must knows about this fact and must take it into account. > If the user changed the file by any other way (edit, copy paste, etc.) VCS > should > consider this file "edited". Any other variant is acceptable only if the VCS > additionally detects some kind of edits, made by the user - for example > moving, > renaming or deletion of the files. > IMHO, omiting actions, explicitly declared by command is not acceptable.
It has been a few years, but as I recall, SVN would warn that the working copy contains mixed revisions and would not allow the commit. I do remember that early on I got into the habit of doing such explorations in a separate working copy created for the purpose. copying which ever files I needed to fix what I was working on. Yes, this is extra work, but in the long run, I am sure it has saved me a lot of grief. _______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
