On Oct 25, 2009, at 8:34 PM, Zed A. Shaw wrote: > On Sun, Oct 25, 2009 at 07:20:16PM -0400, D. Richard Hipp wrote: >> >> On Oct 25, 2009, at 2:27 PM, Zed A. Shaw wrote: >> >>> Currently, the behavior is that fossil overwrites files without any >>> prompting using the "latest one wins" method. >> >> It shouldn't be doing that! Can you give me an example so that I can >> track down the problem? > > Ah, I will try to track this down then. Now just to be clear, do you > mean that if I have uncommitted edits to a file, and fossil has edits > that conflict, that fossil SHOULD prompt me before merging? Or, do > you > mean that it will merge and then I can use undo to get my stuff back? >
The latter. It will merge. You can undo if you don't like the result. >> >> Update already does make backups. If you do "fossil update" and >> don't >> like the results, just type "fossil undo" and everything should >> revert >> to the state it was in before the update. > > Yes! I knew there had to be a little command I was missing. Awesome, > I'll let my peoples know. > > -- > Zed A. Shaw > http://zedshaw.com/ > _______________________________________________ > fossil-users mailing list > [email protected] > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users D. Richard Hipp [email protected] _______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
