On 9/7/2011 12:42 PM, Konstantin Khomoutov wrote:
I mean, I fire `fossil ui`, navigate to that commit, click its link, click "edit" link and now what? Should I go with "Make this check-in the start of a new branch named..." and enter "mistake" there?
Yes.
But what if I already have a commit on that "mistake" branch? What is the sense of that "new" word then?
It's not a problem. It is a new branch based off whatever branch you were on before, it just happens to have the same name as an existing branch. If for some reason you checkout or update to 'mistake', you'll get the most recent commit tagged with mistake. If you really wanted to go back in time to a previous mistake branch, you'd need the id of the commit to go back to.
P.S. I really miss `git reset --hard HEAD^` there. Why jump through all of these non-obvious hoops just to zap the just created commit which is not pushed anywhere yet?
I'd welcome a command line method of moving a commit to a new branch, but I prefer the fossil method of making it very hard to destroy your work.
You could also just update back to the previous commit (id would be shown as parent of the current commit when you `fossil status`) and keep going. (Creating a fork.) Not as clear to others as moving the erroneous commit, but AFAIK other people updating to your latest work will get the latest commit. So long as you make a correct commit before syncing, the correct commit will be latest.
-- Joshua Paine LetterBlock: Web Applications Built With Joy http://letterblock.com/ 301-576-1920 _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
