Re: [fossil-users] git equivalent commands
Thanks for your feedback! fossil revert worked as expected! Also fossil checkout -f branch_or_commit_d worked too, but usually you don't want to change the branch, just remove the changes. I don't except to have all the features of git, since there are a lot of different concepts going on with fossil. We are using fossil with the team in one project for the first time. And we are trying to work the fossil way considering our workflow. So we are learning. I just added the git commands to easily explain the actions we are trying to run, otherwise it would be harder, longer to explain. Furthermore it would be less accurate. The reason we are looking for those commands is because during our development workflow we find out we didn't know how to do certain actions we used to do with You-know-What ( The-Thing-That-Must-Not-Be-Named ) The grep command is a really great deal for us because: * We use vim and is the fastest way to search on the entire project (think of a project with 100M+ with binaries and source code and we are not allowed to change that) * Is WAY much faster than grep -R * is more flexible than Ack (considering searching on .wiki, README and any other file that is not code) I think is interesting to know how to rollback a commit. I'm used to just add a new commit removing the changes. That way we keep the history (made a mistake, fixed the mistake) Also, What we couldn't find out is how to delete a branch (or at least close it) Regards, Federico Ramallo ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] git equivalent commands
Awesome! I'll check it out! :D 2011/3/12 Joerg Sonnenberger jo...@britannica.bec.de On Sat, Mar 12, 2011 at 09:57:25AM -0600, Federico Ramallo wrote: Also, What we couldn't find out is how to delete a branch (or at least close it) Use the web ui. You can mark a branch leaf as closed and you can also move commits to different branches / change the tags etc. Joerg ___ 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
Re: [fossil-users] git equivalent commands
On Mar 12, 2011, at 10:57 AM, Federico Ramallo frama...@gmail.com wrote: we are trying to work the fossil way considering our workflow. So we are learning. I just added the git commands to easily explain the actions we are trying to run, It's all good. Since many of us are familiar with git, too, it's a very reasonable way to proceed. The grep command is a really great deal for us because: * is more flexible than Ack (considering searching on .wiki, README and any other file that is not code) You probably know that ack can optionally search all file types or configurable file types. You might also try writing yourself a one-line shell script that makes use of `fossil ls` (to list all files in the project) and one of the text search tools for more control. If the large binaries aren't checked in, then this will automatically avoid searching those. If they are, you'll probably want to filter the list with grep before searching. I believe there has been talk of adding search to fossil, but I don't know about progress on that if any. I think is interesting to know how to rollback a commit. I'm used to just add a new commit removing the changes. That way we keep the history (made a mistake, fixed the mistake) I thought this just came up, but I can't find it. Of course in fossil you can still just add a commit reversing the changes, but another option is to make the mistaken commit the start of a new branch named 'oops' or 'mistake' and immediately close that branch. The record of the error still exists, but the branch timeline is a clearer reference on the actual progress of the code. (To do this, run `fossil ui`, go to the timeline, click on the mistaken commit, click on 'Edit' by 'Other Links:, and use the checkbox and textbox by Branching to move the commit to a new branch. You'll want to mark the Leaf Closure checkbox as well.) Also, What we couldn't find out is how to delete a branch (or at least close it) Branches cannot be deleted (nor can much of anything be completely deleted in fossil!), but to close the branch, use the Leaf Closure checkbox on the details page of the latest commit in the branch. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] git equivalent commands
On Sat, Mar 12, 2011 at 11:33 AM, Joshua Paine jos...@letterblock.comwrote: I think is interesting to know how to rollback a commit. I'm used to just add a new commit removing the changes. That way we keep the history (made a mistake, fixed the mistake) ... another option is to make the mistaken commit the start of a new branch named 'oops' or 'mistake' and immediately close that branch. An example of doing exactly that can be seen in SQLite sources here: http://www.sqlite.org/src/timeline?c=2010-10-01+15%3A11%3A09 I checked in a change that I thought was good. But later I figured out it was a bad idea, so I move the change onto the mistake branch, closed that branch, and amended the check-in commit to explain why it was a bad idea. -- 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
Re: [fossil-users] git equivalent commands
Maybe we should start a comparison table on the wiki svn/git/mercurial/fossil equivalent commands Steve On Fri, Mar 11, 2011 at 5:41 PM, Konstantin Khomoutov flatw...@users.sourceforge.net wrote: On Fri, Mar 11, 2011 at 01:27:39AM -0600, Federico Ramallo wrote: I was wondering how to do git reset --hard on a fossil repository. Because fossil clean only clear extra files, but what about changed files? Possibly you need `fossil revert`. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users -- Refactor Engage. Succeed. Repeat. PO Box 802, Labrador, Q 4215, Australia tel: +61 (0)7 5668 3424 web: refactor.com.au ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] git equivalent commands
On Fri, 11 Mar 2011 18:53:55 +1000 Steve Dalton st...@refactor.com.au wrote: Maybe we should start a comparison table on the wiki svn/git/mercurial/fossil equivalent commands http://en.wikipedia.org/wiki/Comparison_of_revision_control_software#Basic_Commands Though it doesn't cover the command in question, and the section on advanced commands doesn't include fossil. mike -- Mike Meyer m...@mired.org http://www.mired.org/consulting.html Independent Software developer/SCM consultant, email for more information. O ascii ribbon campaign - stop html mail - www.asciiribbon.org ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] git equivalent commands
Should things like lock and rebase be no as apposed to Unknown? I understand rebase is something that can't be done in Fossil due to fossilizing the history right? I'm also certain fossil doesn't support locking, right? :) Also - does Fossil support Unicode filenames? Happy to update the page if we can clarify answers here. We should also probably link to the page from the fossil wiki as it's a very useful reference. Steve On Fri, Mar 11, 2011 at 7:34 PM, Steve Dalton st...@refactor.com.au wrote: Looks like someone just added it... good job. On Fri, Mar 11, 2011 at 7:11 PM, Mike Meyer m...@mired.org wrote: On Fri, 11 Mar 2011 18:53:55 +1000 Steve Dalton st...@refactor.com.au wrote: Maybe we should start a comparison table on the wiki svn/git/mercurial/fossil equivalent commands http://en.wikipedia.org/wiki/Comparison_of_revision_control_software#Basic_Commands Though it doesn't cover the command in question, and the section on advanced commands doesn't include fossil. mike -- Mike Meyer m...@mired.org http://www.mired.org/consulting.html Independent Software developer/SCM consultant, email for more information. O ascii ribbon campaign - stop html mail - www.asciiribbon.org ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users -- Refactor Engage. Succeed. Repeat. PO Box 802, Labrador, Q 4215, Australia tel: +61 (0)7 5668 3424 web: refactor.com.au -- Refactor Engage. Succeed. Repeat. PO Box 802, Labrador, Q 4215, Australia tel: +61 (0)7 5668 3424 web: refactor.com.au ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] git equivalent commands
On Fri, 11 Mar 2011 19:40:03 +1000 Steve Dalton st...@refactor.com.au wrote: Should things like lock and rebase be no as apposed to Unknown? I understand rebase is something that can't be done in Fossil due to fossilizing the history right? I'm also certain fossil doesn't support locking, right? :) Lock is pretty much impossible in a DVCS. If you check the advanced commands table, it's no for pretty much all of them (including fossil), even though it's unknown for all of them in the basic commands table. I guess since fossil allows multiple checkouts from one repo, it could lock files *in that repo*. As you say, rebase cuts against what I understand to be fossils philosophy. And the rollback question is sorta odd. You can delete things from fossil, by shunning them then rebuilding (?) the repo. However, there's still a record of it in the shun list, and possibly elsewhere. I'd say that no here is at least as correct as mercurials yes when mercurial only allows you to remove the *last* change to the repo. While questioning things - I notice that interactive commit is listed as yes in the advanced features table. The comment says that means you can cherry-pick changes, meaning you can commit some changes to a file without committing all of them. If that's right, I couldn't find it. mike -- Mike Meyer m...@mired.org http://www.mired.org/consulting.html Independent Software developer/SCM consultant, email for more information. O ascii ribbon campaign - stop html mail - www.asciiribbon.org ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] git equivalent commands
On Mar 11, 2011 11:21am, Mike Meyer m...@mired.org wrote: And the rollback question is sorta odd. You can delete things from fossil, by shunning them then rebuilding (?) the repo. However, there's still a record of it in the shun list, and possibly elsewhere. I'd say that no here is at least as correct as mercurials yes when mercurial only allows you to remove the *last* change to the repo. Another option that fossil offers is to move an unwanted commit away to a new different branch after the fact (that you'd typically name mistake), which provides the equivalent functionality of a rollback except for the fact that it is still visible in the history. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] git equivalent commands
On Fri, Mar 11, 2011 at 2:01 PM, Twylite twyl...@crypt.co.za wrote: On 09:59 PM, a.chava...@gmail.com wrote: Another option that fossil offers is to move an unwanted commit away to a new different branch after the fact (that you'd typically name mistake), which provides the equivalent functionality of a rollback except for the fact that it is still visible in the history. That sounds really useful ... how do you do it? Use the web interface to edit the commit, check make this commit the start of a branch, and set the branch name. You also want to check the leaf closure box too since if it's a mistake commit that you're getting out of the way you probably don't want to commit anything else on that branch. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] git equivalent commands
On Fri, March 11, 2011 7:27 am, Federico Ramallo wrote: Hi, I was wondering how to do git reset --hard on a fossil repository. Because fossil clean only clear extra files, but what about changed files? Fossil isn't git, why should it have an exact equivalent of a git command? work out why you need that git command, then figure out how Fossil could meet that need - and ask if it is really needed so much when you are using fossil instead of git. Eric ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] git equivalent commands
On Fri, Mar 11, 2011 at 06:58:59PM -, Eric wrote: On Fri, March 11, 2011 7:27 am, Federico Ramallo wrote: Hi, I was wondering how to do git reset --hard on a fossil repository. Because fossil clean only clear extra files, but what about changed files? 'fossil revert' may be something close? ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] git equivalent commands
2011/3/11 Lluís Batlle i Rossell virik...@gmail.com On Fri, Mar 11, 2011 at 06:58:59PM -, Eric wrote: On Fri, March 11, 2011 7:27 am, Federico Ramallo wrote: Hi, I was wondering how to do git reset --hard on a fossil repository. Because fossil clean only clear extra files, but what about changed files? 'fossil revert' may be something close? See fossil checkout and the -f option. ___ 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
[fossil-users] git equivalent commands
Hi, I was wondering how to do git reset --hard on a fossil repository. Because fossil clean only clear extra files, but what about changed files? Also I was wondering about git grep, there is any plan on implementing the command? I think is really really usefull Also Today we found a bug on fossil sqlite3 command, How should I add it as a ticket? Do i need a user or I could add it as anonymous? Regards, Federico Ramallo ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] git equivalent commands
On Fri, Mar 11, 2011 at 01:27:39AM -0600, Federico Ramallo wrote: I was wondering how to do git reset --hard on a fossil repository. Because fossil clean only clear extra files, but what about changed files? Possibly you need `fossil revert`. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
