Re: [fossil-users] Incorrect branch content on import
On 22/12/2013 0:55, Roy Marples wrote: On 21/12/2013 21:11, Roy Marples wrote: I'm trying to move my dhcpcd git repository [1] to fossil [2]. While it works for the most part, it seems that the branches called trunk and dhcpcd-5 have the same commits, which is just wrong. By adding a commit to the dhcpcd-5 branch in git, exporting and then importing into fossil it now seems to work. So basically the error happened because once the dhcpd-5 branch was made there were no commits in it. Hope this helps someone fixing it. Roy ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] Incorrect branch content on import
Hi List I'm trying to move my dhcpcd git repository [1] to fossil [2]. While it works for the most part, it seems that the branches called trunk and dhcpcd-5 have the same commits, which is just wrong. I have successfully done a git export | git import to a new repository [3] to see if it's a git problem, but the end product is fine. Lastly, I did a fossil export to git [4] which now exhibits the same problems. So I must assume the problem is in fossil. I've tried versions 1.26 and 1.27. Is this something easily fixable? Can I provide any more help debugging it? One other thing of note, it seems that on import all commiters are me. While this is true, I would rather record the author on the git commit. Is this posible? Thanks Roy [1] http://roy.marples.name/cgi-bin/gitweb.cgi?p=dhcpcd.git;a=summary [2] http://roy.marples.name/fossil/dhcpcd/ [3] http://roy.marples.name/cgi-bin/gitweb.cgi?p=dhcpcd-test/.git;a=summary [4] http://roy.marples.name/cgi-bin/gitweb.cgi?p=dhcpcd-new/.git;a=summary ___ 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] Incorrect branch content on import
On 21/12/2013 21:11, Roy Marples wrote: I'm trying to move my dhcpcd git repository [1] to fossil [2]. While it works for the most part, it seems that the branches called trunk and dhcpcd-5 have the same commits, which is just wrong. By adding a commit to the dhcpcd-5 branch in git, exporting and then importing into fossil it now seems to work. I can live with that, as the commit is kinda valid using a more recent compiler than when the branch was done. I did this in different repos - dhcpcd-test, so the initial links are still valid incase anyone wants to debug this. I'll be doing that in the main repo tomorrow so I can move forward, but I'll make a backup first and post the link here incase someone really does want to fix it. I also exported it back to git and aside from committer name and the branch names having _ instead of say a . or a - it looks good. I assume the branch renaming is some kind of bug because the branch names look fine in fossil itself. A less important issue is that there seems to be no tie between trunk and git master in the fresh export (ie the git repo looks blank aside from the branch content). Lastly, before I dive into the fossil code to try and address the branch name export issue, does anyone know how fossil handles user names on import/export? Ideally I'd like to preserve the My Name m...@name.org in my current git repo @ import and also show this @ export. Thanks Roy ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
