On Tue, Nov 19, 2013 at 11:35:39PM -0700, Andy Bradford wrote: > Thus said "Andy Bradford" on 19 Nov 2013 23:18:40 -0700: > > Thus said Ben Collver on Tue, 19 Nov 2013 21:24:33 -0800: > > > * Edit commit faf2ad2219 > > > * Start new branch trunk > > > > You need to also edit 816b791510bd638d and add the trunk branch there. > > You will also want to edit 1b524f8b49, a242a0a019, and 5080e9080d to > remove the trunk tag from there (not the branch).
Thank you, that is what I missed. > It looks like the start of your problem were the edits to the trunk > here: > > http://code.rogueclass.org/rcl/timeline?n=30&b=2013-09-16+05:33:49 > > Notice that you edited faf2ad2219 and removed the branch tag. I believe > what you really intended to do was edit 5080e9080d make it the start of > a new branch. As I recall it, I: 1) started a new branch sdl2-egl-fbcon on commit faf2ad2219 2) realized that I wanted commit 5080e9080d instead 3) edited commit faf2ad2219 to cancel the sdl2-egl-fbcon branch I think this also canceled trunk, but I am not sure why. 4) started a new branch sdl2-egl-fbcon on commit 5080e9080d 5) took a while to realize that trunk had been canceled It seems that all is well now. Thanks for the help! -Ben p.s. Every time I reboot the VM, the clock goes way off. I corrected this by configuring the VM to use UTC instead of local time. _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
