On Thu, Mar 20, 2014 at 8:49 AM, Richard Hipp <d...@sqlite.org> wrote:
> > On Thu, Mar 20, 2014 at 11:44 AM, Matt Welland <estifo...@gmail.com>wrote: > >> This is good feedback and I think mentioning checkout/co in the top level >> help is important. >> > > +1 > > >> >> What I teach when doing fossil training is the following: >> >> 1. Use "fossil checkout" to move from branch to branch (I try to use >> "checkout" consistently in the training. "co" is nice but confusing) >> >> 2. If you have made changes and wish to commit them on a different branch >> use "fossil update" to move to that branch and then commit. >> >> 3. Using "fossil update" to move from branch to branch is probably fine >> but I suspect that "fossil checkout" is more rigorous and may be safer. >> > > FWIW, I don't think I have ever used "fossil checkout" to move to a > different branch or checkout (which is something I do dozens or hundreds of > times on a typical working day). I always use "fossil update" (or usually > just "fossil up"). I don't even remember why I added the "fossil checkout" > command. > I've definitely seen issues with "fossil update" that were solved by doing "fossil checkout" but because they were solved I've never reported them assuming that the purpose of "fossil checkout" was in part to do a clean and safe switch to a different branch. If that is not the case then I'll try to capture/reproduce the issue(s) next time I run into them. One case I'm pretty sure of was where a symlink was converted to a directory or vice-versa. Checkout worked but update failed. > > >> >> A comment to those who find they seldom branch: I use branching and >> merging extensively as a tool to organize work and enable flights of fancy >> and exploration. Obviously it depends highly on the problems you are >> solving but I suspect that if you aren't branching then either you are >> working on a relatively linear and straightforward problem or you aren't >> using fossil to its fullest. >> >> > -- > D. Richard Hipp > d...@sqlite.org > > _______________________________________________ > fossil-users mailing list > fossil-users@lists.fossil-scm.org > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users > > -- Matt -=- 90% of the nations wealth is held by 2% of the people. Bummer to be in the majority...
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
