On Sat, May 21, 2011 at 11:13 AM, Zed A. Shaw <zeds...@zedshaw.com> wrote: > On Sat, May 21, 2011 at 10:57:45AM -0700, Matt Welland wrote: >> Hi Zed, >> >> Please confirm if you really lost local changes. That would be a big >> concern for me. I haven't lost any non-checked in work and would like >> to keep it that way. > > Oh it's confirmed.
That's a major bummer. I couldn't reproduce what you described but see in your latest message that it was the revert that killed your work. I modified a file and did the update and saw this: ..... REMOVE tools/m2sh/tests/runtests.sh REMOVE tools/m2sh/tests/sample.conf -------------- WARNING: 1 merge conflicts - see messages above for details. "fossil undo" is available to undo changes to the working checkout. .... I actually don't think there is anything we want to change in fossil with respect to this (other than the bug fix already implemented). Losing three days is something you could have (obviously) avoided by checking in more often or by checking in to a private branch. Based on my experience you will want to adopt this behavior with git also. I lost work on git when trying to adapt it to a pre-existing methodology, merging into a modified branch in git is very confusing (at least for me). It wasn't git's fault that I lost the data but it sure was frustrating. > > -- > Zed A. Shaw > http://zedshaw.com/ > _______________________________________________ > fossil-users mailing list > fossil-users@lists.fossil-scm.org > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users > _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
