Re: [fossil-users] branch vs tags when importing from git
On Tue, Feb 15, 2011 at 1:17 PM, Mark Janssen mpc.jans...@gmail.com wrote: And continuing to reply to myself, the diff to import.c below seems to correctly tag the revisions in at least the case of the first test script. (It also contains some renaming of master-trunk but that can be ignored). I have checked in a change to Fossil based on the patch provided by mjanssen (thanks!). If you have some git repositories with lots of tags, please try importing into the latest Fossil and let me know if you encounter any difficulties. http://www.fossil-scm.org/fossil/info/496aacd10e -- 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] branch vs tags when importing from git
On Sun, Feb 13, 2011 at 4:15 PM, Richard Hipp d...@sqlite.org wrote: On Sun, Feb 13, 2011 at 4:09 PM, Martin Gagnon eme...@gmail.com wrote: I've convert a git repository to fossil and I'm a bit confuse with my tags I had in git, the way they become in fossil. I had some tag in the original git repo, which was not branch, only a tag to a particular version. Once I convert to fossil, those tag propagate to future versions until next tag is reach. Those tags seems to be like real branches after conversion to fossil. Did someone else get the same problem? Or I miss something? I've seen the same thing. Either I'm misunderstanding the git-fast-export file format documentation or else git-fast-export is getting branches and tags confused. git-fast-import works and generates the correct repository for the output of git-fast-export. So there must be some way of interpreting the output of git-fast-export correctly. Anybody with clues on how to do this, please help! I'm not sure which it is, but I am leaning toward the problem being in git-fast-export. Others have reported issues with that tool, and the documentation for git-fast-export itself explains that it cannot successfully export the Linux kernel repository I've got some ideas on how I might work around the (presumed) brokenness in git-fast-export. If you are able to send me the output of git-fast-export from your repository, or let me clone you git repository, that will give me another example repository to work with. Thanks -- Martin ___ 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 -- 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] branch vs tags when importing from git
On Tue, Feb 15, 2011 at 1:41 PM, Richard Hipp d...@sqlite.org wrote: On Sun, Feb 13, 2011 at 4:15 PM, Richard Hipp d...@sqlite.org wrote: On Sun, Feb 13, 2011 at 4:09 PM, Martin Gagnon eme...@gmail.com wrote: I've convert a git repository to fossil and I'm a bit confuse with my tags I had in git, the way they become in fossil. I had some tag in the original git repo, which was not branch, only a tag to a particular version. Once I convert to fossil, those tag propagate to future versions until next tag is reach. Those tags seems to be like real branches after conversion to fossil. Did someone else get the same problem? Or I miss something? I've seen the same thing. Either I'm misunderstanding the git-fast-export file format documentation or else git-fast-export is getting branches and tags confused. git-fast-import works and generates the correct repository for the output of git-fast-export. So there must be some way of interpreting the output of git-fast-export correctly. Anybody with clues on how to do this, please help! I'm not sure which it is, but I am leaning toward the problem being in git-fast-export. Others have reported issues with that tool, and the documentation for git-fast-export itself explains that it cannot successfully export the Linux kernel repository I've got some ideas on how I might work around the (presumed) brokenness in git-fast-export. If you are able to send me the output of git-fast-export from your repository, or let me clone you git repository, that will give me another example repository to work with. Thanks -- Martin ___ 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 -- 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 Maybe I am missing something here, but aren't tags simply identifiable by commits with revision prefix /refs/tags? Mark ___ 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] branch vs tags when importing from git
On Tue, Feb 15, 2011 at 2:31 PM, Mark Janssen mpc.jans...@gmail.com wrote: On Tue, Feb 15, 2011 at 1:41 PM, Richard Hipp d...@sqlite.org wrote: On Sun, Feb 13, 2011 at 4:15 PM, Richard Hipp d...@sqlite.org wrote: On Sun, Feb 13, 2011 at 4:09 PM, Martin Gagnon eme...@gmail.com wrote: I've convert a git repository to fossil and I'm a bit confuse with my tags I had in git, the way they become in fossil. I had some tag in the original git repo, which was not branch, only a tag to a particular version. Once I convert to fossil, those tag propagate to future versions until next tag is reach. Those tags seems to be like real branches after conversion to fossil. Did someone else get the same problem? Or I miss something? I've seen the same thing. Either I'm misunderstanding the git-fast-export file format documentation or else git-fast-export is getting branches and tags confused. git-fast-import works and generates the correct repository for the output of git-fast-export. So there must be some way of interpreting the output of git-fast-export correctly. Anybody with clues on how to do this, please help! I'm not sure which it is, but I am leaning toward the problem being in git-fast-export. Others have reported issues with that tool, and the documentation for git-fast-export itself explains that it cannot successfully export the Linux kernel repository I've got some ideas on how I might work around the (presumed) brokenness in git-fast-export. If you are able to send me the output of git-fast-export from your repository, or let me clone you git repository, that will give me another example repository to work with. Thanks -- Martin ___ 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 -- 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 Maybe I am missing something here, but aren't tags simply identifiable by commits with revision prefix /refs/tags? Mark After some further investigation, it seems that git fast-export is making a mess of the tags. Commit commands refer to tags that have not been created yet. This does not play very well with the fossil approach of not rewriting history. I suspect the only way to solve this is to make a separate non propagating tagging phase after the whole repo has been converted. Mark ___ 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] branch vs tags when importing from git
On Sun, Feb 13, 2011 at 4:15 PM, Richard Hipp d...@sqlite.org wrote: On Sun, Feb 13, 2011 at 4:09 PM, Martin Gagnon eme...@gmail.com wrote: I've convert a git repository to fossil and I'm a bit confuse with my tags I had in git, the way they become in fossil. I had some tag in the original git repo, which was not branch, only a tag to a particular version. Once I convert to fossil, those tag propagate to future versions until next tag is reach. Those tags seems to be like real branches after conversion to fossil. Did someone else get the same problem? Or I miss something? I've seen the same thing. Either I'm misunderstanding the git-fast-export file format documentation or else git-fast-export is getting branches and tags confused. I'm not sure which it is, but I am leaning toward the problem being in git-fast-export. Others have reported issues with that tool, and the documentation for git-fast-export itself explains that it cannot successfully export the Linux kernel repository I've got some ideas on how I might work around the (presumed) brokenness in git-fast-export. If you are able to send me the output of git-fast-export from your repository, or let me clone you git repository, that will give me another example repository to work with. I have another test, I don't know if it's because of very close timestamps, but the graph of this one on fossil look weird (attached file: git_tags_export_test2.sh) Look at 200 Entries -- Martin git_tags_export_test2.sh Description: Bourne shell script ___ 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] branch vs tags when importing from git
On Mon, Feb 14, 2011 at 12:59 AM, Martin Gagnon eme...@gmail.com wrote: I've made a little script (attached here: git_tags_export_test.sh ) that produce a small git repo with few tags that illustrated it enought. You can look at the git repo graph with gitk after running the script, and compare it with the fossil exported one.. Good test case, Martin. Tnx. Looking at the output of gitk and the output of git-fast-export, I claim this script clearly demonstrates a bug in git-fast-export. The documentation on git-fast-export is ambiguous though, so I'll leave open the possibility that I am misinterpreting the git-fast-export output file. If any other readers have an idea how I might interpret the git-fast-export file differently (and correctly) please let me know. regards -- Martin ___ 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] branch vs tags when importing from git
On Sun, Feb 13, 2011 at 4:09 PM, Martin Gagnon eme...@gmail.com wrote: I've convert a git repository to fossil and I'm a bit confuse with my tags I had in git, the way they become in fossil. I had some tag in the original git repo, which was not branch, only a tag to a particular version. Once I convert to fossil, those tag propagate to future versions until next tag is reach. Those tags seems to be like real branches after conversion to fossil. Did someone else get the same problem? Or I miss something? I've seen the same thing. Either I'm misunderstanding the git-fast-export file format documentation or else git-fast-export is getting branches and tags confused. I'm not sure which it is, but I am leaning toward the problem being in git-fast-export. Others have reported issues with that tool, and the documentation for git-fast-export itself explains that it cannot successfully export the Linux kernel repository I've got some ideas on how I might work around the (presumed) brokenness in git-fast-export. If you are able to send me the output of git-fast-export from your repository, or let me clone you git repository, that will give me another example repository to work with. Thanks -- Martin ___ 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] branch vs tags when importing from git
On Sun, Feb 13, 2011 at 4:15 PM, Richard Hipp d...@sqlite.org wrote: On Sun, Feb 13, 2011 at 4:09 PM, Martin Gagnon eme...@gmail.com wrote: I've convert a git repository to fossil and I'm a bit confuse with my tags I had in git, the way they become in fossil. I had some tag in the original git repo, which was not branch, only a tag to a particular version. Once I convert to fossil, those tag propagate to future versions until next tag is reach. Those tags seems to be like real branches after conversion to fossil. Did someone else get the same problem? Or I miss something? I've seen the same thing. Either I'm misunderstanding the git-fast-export file format documentation or else git-fast-export is getting branches and tags confused. I'm not sure which it is, but I am leaning toward the problem being in git-fast-export. Others have reported issues with that tool, and the documentation for git-fast-export itself explains that it cannot successfully export the Linux kernel repository I've got some ideas on how I might work around the (presumed) brokenness in git-fast-export. If you are able to send me the output of git-fast-export from your repository, or let me clone you git repository, that will give me another example repository to work with. Fortunalely, I cannot give you this repo, it's is corporate stuff. But I've made a little script (attached here: git_tags_export_test.sh ) that produce a small git repo with few tags that illustrated it enought. You can look at the git repo graph with gitk after running the script, and compare it with the fossil exported one.. regards -- Martin git_tags_export_test.sh Description: Bourne shell script ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
