Re: [fossil-users] delete a branch
On Oct 1, 2011, at 3:19 PM, Paul Ruizendaal wrote: Perhaps it is bloat, but would it be useful if branches with the tag 'mistake' or perhaps 'hidden' were not shown on the default timeline in the web interface, and having an option for showing the full timeline? It would be a bit like the full file view and the current file view when showing files. I second this idea. Hiding mistakes by default is at least reasonable. Kind regards, Remigiusz Modrzejewski ___ 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] delete a branch
There is something unsatisfying about the mistake solution, at least that is my feeling. Conceptually, there is a difference between not deleting history (which I think is a very valuable asset in fossil) and always showing full history, rubbing mistakes in your face, especially when still learning fossil. Perhaps it is bloat, but would it be useful if branches with the tag 'mistake' or perhaps 'hidden' were not shown on the default timeline in the web interface, and having an option for showing the full timeline? It would be a bit like the full file view and the current file view when showing files. Paul On 30 Sep 2011, at 22:30 , Richard Hipp wrote: On Fri, Sep 30, 2011 at 4:14 PM, Tomek Kott tkott.s...@gmail.com wrote: nope*. What many people do, including the SQLite Fossil repos, is simply rename the branch as mistake, close the leaf, update back to trunk, and start again. See, for example, http://www.sqlite.org/src/timeline?r=mistake Tomek * - I think it would be somehow possible to get the artifact # and shun it, so technically, it is possible. But there is no command for it. The intent of Fossil is to preserve history, not delete it. Hence, there is no easy way to delete a branch. Shunning is intended as an emergency mechanism to remove content that should have never gotten into the repository in the first place - things such as wiki or ticket spam. Shunning is not intended to remove content just because you think it is obsolete. Mark it as a mistake, as Tomek suggests above. But don't destroy history. On Fri, Sep 30, 2011 at 4:01 PM, Erlis Vidal er...@erlisvidal.com wrote: I'm sorry for this so n00b question but I'm not able to find this anywhere. Is it possible to delete a branch? I've created a branch by mistake, in this case I don't want to merge the branch, I'm looking for the git equivalent -f (force delete) Thanks, Erlis ___ 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 -- 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 ___ 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] delete a branch
On Sat, Oct 1, 2011 at 3:19 PM, Paul Ruizendaal p...@planet.nl wrote: There is something unsatisfying about the mistake solution, at least that is my feeling. Conceptually, there is a difference between not deleting history (which I think is a very valuable asset in fossil) and always showing full history, rubbing mistakes in your face, especially when still learning fossil. LOL! If i'm not mistaken, some people have removed data by exporting their repo to git format, deleting it there, and then re-importing it. -- - stephan beal http://wanderinghorse.net/home/stephan/ ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] delete a branch
I'm sorry for this so n00b question but I'm not able to find this anywhere. Is it possible to delete a branch? I've created a branch by mistake, in this case I don't want to merge the branch, I'm looking for the git equivalent -f (force delete) Thanks, Erlis ___ 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] delete a branch
nope*. What many people do, including the SQLite Fossil repos, is simply rename the branch as mistake, close the leaf, update back to trunk, and start again. See, for example, http://www.sqlite.org/src/timeline?r=mistake Tomek * - I think it would be somehow possible to get the artifact # and shun it, so technically, it is possible. But there is no command for it. On Fri, Sep 30, 2011 at 4:01 PM, Erlis Vidal er...@erlisvidal.com wrote: I'm sorry for this so n00b question but I'm not able to find this anywhere. Is it possible to delete a branch? I've created a branch by mistake, in this case I don't want to merge the branch, I'm looking for the git equivalent -f (force delete) Thanks, Erlis ___ 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] delete a branch
On Fri, Sep 30, 2011 at 4:14 PM, Tomek Kott tkott.s...@gmail.com wrote: nope*. What many people do, including the SQLite Fossil repos, is simply rename the branch as mistake, close the leaf, update back to trunk, and start again. See, for example, http://www.sqlite.org/src/timeline?r=mistake Tomek * - I think it would be somehow possible to get the artifact # and shun it, so technically, it is possible. But there is no command for it. The intent of Fossil is to preserve history, not delete it. Hence, there is no easy way to delete a branch. Shunning is intended as an emergency mechanism to remove content that should have never gotten into the repository in the first place - things such as wiki or ticket spam. Shunning is not intended to remove content just because you think it is obsolete. Mark it as a mistake, as Tomek suggests above. But don't destroy history. On Fri, Sep 30, 2011 at 4:01 PM, Erlis Vidal er...@erlisvidal.com wrote: I'm sorry for this so n00b question but I'm not able to find this anywhere. Is it possible to delete a branch? I've created a branch by mistake, in this case I don't want to merge the branch, I'm looking for the git equivalent -f (force delete) Thanks, Erlis ___ 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 -- 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] delete a branch
On Fri, Sep 30, 2011 at 10:01 PM, Erlis Vidal er...@erlisvidal.com wrote: Is it possible to delete a branch? I've created a branch by mistake, in this case I don't want to merge the branch, I'm looking for the git equivalent -f (force delete) http://www.fossil-scm.org/index.html/doc/trunk/www/shunning.wiki -- - stephan beal http://wanderinghorse.net/home/stephan/ ___ 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] delete a branch
Hi all, thanks for the answers, maybe I'm approaching fossil from the git side. Maybe I have a misconception. In Git a branch is just a pointer to a given commit, removing the branch won't remove any content, unless the branch is not merged so I need to do the force thing but that's not the case. My mistake was that I create a branch but forgot to check it out, and did a couple of commits. Then I realized that the branch was there, but empty... it was my bad. I just noticed in the timeline that with fossil, creating a branch creates also a commit... hmmm now I see something different... Is there something I can read that could explain me better the fossil internals a wiki? Thanks for this job, Erlis On Fri, Sep 30, 2011 at 4:32 PM, Stephan Beal sgb...@googlemail.com wrote: On Fri, Sep 30, 2011 at 10:01 PM, Erlis Vidal er...@erlisvidal.comwrote: Is it possible to delete a branch? I've created a branch by mistake, in this case I don't want to merge the branch, I'm looking for the git equivalent -f (force delete) http://www.fossil-scm.org/index.html/doc/trunk/www/shunning.wiki -- - stephan beal http://wanderinghorse.net/home/stephan/ ___ 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] delete a branch
http://fossil-scm.org/index.html/doc/trunk/www/branching.wiki On Fri, Sep 30, 2011 at 1:38 PM, Erlis Vidal er...@erlisvidal.com wrote: Hi all, thanks for the answers, maybe I'm approaching fossil from the git side. Maybe I have a misconception. In Git a branch is just a pointer to a given commit, removing the branch won't remove any content, unless the branch is not merged so I need to do the force thing but that's not the case. My mistake was that I create a branch but forgot to check it out, and did a couple of commits. Then I realized that the branch was there, but empty... it was my bad. I just noticed in the timeline that with fossil, creating a branch creates also a commit... hmmm now I see something different... Is there something I can read that could explain me better the fossil internals a wiki? Thanks for this job, Erlis On Fri, Sep 30, 2011 at 4:32 PM, Stephan Beal sgb...@googlemail.com wrote: On Fri, Sep 30, 2011 at 10:01 PM, Erlis Vidal er...@erlisvidal.com wrote: Is it possible to delete a branch? I've created a branch by mistake, in this case I don't want to merge the branch, I'm looking for the git equivalent -f (force delete) http://www.fossil-scm.org/index.html/doc/trunk/www/shunning.wiki -- - stephan beal http://wanderinghorse.net/home/stephan/ ___ 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 mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] delete a branch
thanks! On Fri, Sep 30, 2011 at 4:44 PM, Brian Smith br...@linuxfood.net wrote: http://fossil-scm.org/index.html/doc/trunk/www/branching.wiki On Fri, Sep 30, 2011 at 1:38 PM, Erlis Vidal er...@erlisvidal.com wrote: Hi all, thanks for the answers, maybe I'm approaching fossil from the git side. Maybe I have a misconception. In Git a branch is just a pointer to a given commit, removing the branch won't remove any content, unless the branch is not merged so I need to do the force thing but that's not the case. My mistake was that I create a branch but forgot to check it out, and did a couple of commits. Then I realized that the branch was there, but empty... it was my bad. I just noticed in the timeline that with fossil, creating a branch creates also a commit... hmmm now I see something different... Is there something I can read that could explain me better the fossil internals a wiki? Thanks for this job, Erlis On Fri, Sep 30, 2011 at 4:32 PM, Stephan Beal sgb...@googlemail.com wrote: On Fri, Sep 30, 2011 at 10:01 PM, Erlis Vidal er...@erlisvidal.com wrote: Is it possible to delete a branch? I've created a branch by mistake, in this case I don't want to merge the branch, I'm looking for the git equivalent -f (force delete) http://www.fossil-scm.org/index.html/doc/trunk/www/shunning.wiki -- - stephan beal http://wanderinghorse.net/home/stephan/ ___ 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 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] delete a branch
On Fri, Sep 30, 2011 at 10:38 PM, Erlis Vidal er...@erlisvidal.com wrote: My mistake was that I create a branch but forgot to check it out, and did a couple of commits. Then I realized that the branch was there, but empty... it was my bad. In such a case you can use: fossil commit -m '...' --branch branchname ...file list... to commit the changes to a specific branch. i _think_ that will work with existing branches, but it might require a _new_ branch name. I just noticed in the timeline that with fossil, creating a branch creates also a commit... hmmm now I see something different... LOL. There was a long debate about that behaviour a couple months back. Some prefer it that way, some prefer to commit to a specific branch to start the branch. Is there something I can read that could explain me better the fossil internals a wiki? All of those docs are over on the fossil web site. Try: http://fossil-scm.org/index.html/doc/trunk/www/permutedindex.wiki -- - stephan beal http://wanderinghorse.net/home/stephan/ ___ 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] delete a branch
I've been following fossil community just a couple of weeks ago and you guys rocks! I really appreciate all your answers and the welcome I've received... Thanks once more for this amazing project Erlis On Fri, Sep 30, 2011 at 8:04 PM, Stephan Beal sgb...@googlemail.com wrote: On Fri, Sep 30, 2011 at 10:38 PM, Erlis Vidal er...@erlisvidal.comwrote: My mistake was that I create a branch but forgot to check it out, and did a couple of commits. Then I realized that the branch was there, but empty... it was my bad. In such a case you can use: fossil commit -m '...' --branch branchname ...file list... to commit the changes to a specific branch. i _think_ that will work with existing branches, but it might require a _new_ branch name. I just noticed in the timeline that with fossil, creating a branch creates also a commit... hmmm now I see something different... LOL. There was a long debate about that behaviour a couple months back. Some prefer it that way, some prefer to commit to a specific branch to start the branch. Is there something I can read that could explain me better the fossil internals a wiki? All of those docs are over on the fossil web site. Try: http://fossil-scm.org/index.html/doc/trunk/www/permutedindex.wiki -- - stephan beal http://wanderinghorse.net/home/stephan/ ___ 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
