[fossil-users] Post Git import cleanup
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 I just imported another Git repository, this time using Fossil's own import command rather than the script I used before. I'm now trying to clean this project up, and see how good of a fit Fossil will be in this instance. I notice that all commits have my email address as the username. Is there any way to mass assign all commits to my Fossil user? I thought that perhaps the import process would create a user with my email address as its ID and I could do a bit of SQL manipulation, but that doesn't seem to be the case. Is there a way, short of a mass edit? I'm the only current committer on this project, so if there's one megastatement that would assign everything to me then that'd be perfect. I want to rename instances of "master" to "trunk", but it seems that Fossil did something I didn't expect with the master branch. My expectation is that I'd have a line of commits extending to the beginning of my history tagged with "master". They may diverge a bit in places, but I should see commits from October or so of '09 on the master branch, roughly when I began this project. Yet master only extends back to February or so. I just created another Git tag, 0.9.0rc2. I don't see any sign of it in my Fossil repository. 0.9.0rc1 is present, but the last thing I did with this Git repository was tag 0.9.0rc2. The last commits are correct, but I tagged rc2 after making the final commit. It shows up in "git tag -l", and "git status" shows no pending changes awaiting commit, so it seems like Fossil should include this. I made this conversion with a fairly new Fossil, definitely after this evening's bugfix. The repository I'm converting is at: git://spielproject.info/spiel.git I could post the result of my conversion if that would help, but I haven't done much short of add a project name and description. Thanks. -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.10 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAkziHNUACgkQIaMjFWMehWJ/2ACfcpU0D1fSyvfN7xNMmrthhv1D g90An0KvnK8ddghhnesmw5nbII+t9atO =AgMi -END PGP SIGNATURE- ___ 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] Converting from a Git Repository
On Mon, Nov 15, 2010 at 10:45 PM, ja...@zzq.org wrote: > > perfect. that works. Someone must have messed up a commit somewhere > down the line. Probably was me. Thanks much. I look forward to > migrating my code to fossil :) > I found a bug in the importer. Fixed now. Update to the latest fossil (compiled from source - precompiled binaries are not yet available) and you should get a better repository. http://www.fossil-scm.org/fossil/ci/9c31866404 > ___ > 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] Converting from a Git Repository
On Mon, Nov 15, 2010 at 8:37 PM, Richard Hipp wrote: > > > On Mon, Nov 15, 2010 at 10:23 PM, ja...@zzq.org wrote: >> >> > >> > (2) Are you able to share either your Git or your converted Fossil >> > repositories (or both) so that we can see exactly what you are talking >> > about? >> >> http://github.com/com4/q is the git repo. > > > My import of your repository is here: > > https://www.fossil-scm.org/q-demo/timeline?n=300 > > Does the tree look like what you've done? > > I notice that nothing past 2010-10-22 is tagged. Everything is on an > anonymous branch. I'm not sure what is going on there, but I'll have a > look > > If you clone and open this fossil repository they do "fossil update tip" you > should get all of your latest code. No "merging of leaves" is required. > perfect. that works. Someone must have messed up a commit somewhere down the line. Probably was me. Thanks much. I look forward to migrating my code to fossil :) ___ 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] Converting from a Git Repository
On Mon, Nov 15, 2010 at 10:23 PM, ja...@zzq.org wrote: > > > > (2) Are you able to share either your Git or your converted Fossil > > repositories (or both) so that we can see exactly what you are talking > > about? > > http://github.com/com4/q is the git repo. > My import of your repository is here: https://www.fossil-scm.org/q-demo/timeline?n=300 Does the tree look like what you've done? I notice that nothing past 2010-10-22 is tagged. Everything is on an anonymous branch. I'm not sure what is going on there, but I'll have a look If you clone and open this fossil repository they do "fossil update tip" you should get all of your latest code. No "merging of leaves" is required. -- 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] Converting from a Git Repository
On Mon, Nov 15, 2010 at 7:52 PM, Richard Hipp wrote: > > > On Mon, Nov 15, 2010 at 8:33 PM, ja...@zzq.org wrote: >> >> I followed the instructions on >> http://fossil-scm.org/index.html/doc/trunk/www/inout.wiki to import a >> git repo into fossil but when I open the repo it's missing many of my >> changes. >> >> I have found the changes in the leaves section but I'm not sure how to >> "apply" these to my repository so I have all my changes on the >> filesystem so I can continue developing. >> >> How do I get the leaves into my repo so the files and changes appear? >> >> Can someone explain exactly what leaves are? How is one created? > > (1) Which version of Fossil are you using. (What does [fossil help] tell > you?) This is fossil version [e5a734a19a] 2010-11-11 13:36:38 UTC on OS X 10.6 > > (2) Are you able to share either your Git or your converted Fossil > repositories (or both) so that we can see exactly what you are talking > about? http://github.com/com4/q is the git repo. I'm unclear on how to push files up to chiselapp currently, but it shouldn't be too hard to reproduce my problem. texbook:temp jason$ git clone git://github.com/com4/q.git texbook:temp jason$ cd q/ texbook:q jason$ mkdir ../q.fsl/; git fast-export --all | fossil import ../q.fsl/q.fossil Rebuilding repository meta-data... 100.0% complete... Vacuuming... ok project-id: fe525d5618a73e69ad9e76a8cc6b871abe70f621 server-id: 403b367fa1ea0911163780bc0eb72cc5c37603e1 admin-user: jason (password is "x") texbook:q jason$ cd ../q.fsl/ texbook:q.fsl jason$ fossil open q.fossil texbook:q.fsl jason$ ls -la total 2120 drwxr-xr-x 8 jason staff 272 Nov 15 20:22 . drwxr-xr-x 4 jason staff 136 Nov 15 20:22 .. -rw-r--r-- 1 jason staff 41 Nov 15 20:22 .gitignore -rw-r--r-- 1 jason staff12288 Nov 15 20:22 _FOSSIL_ -rw-r--r-- 1 jason staff 1065984 Nov 15 20:21 q.fossil drwxr-xr-x 3 jason staff 102 Nov 15 20:22 scripts drwxr-xr-x 3 jason staff 102 Nov 15 20:22 src There should at the very least be a .issues directory. > > (3) Further reading on "leaves and branches" from a Fossil point of view at > http://www.fossil-scm.org/fossil/doc/trunk/www/branching.wiki Thanks much, I'll check it out. > > >> >> ___ >> 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] Converting from a Git Repository
On Mon, Nov 15, 2010 at 8:33 PM, ja...@zzq.org wrote: > I followed the instructions on > http://fossil-scm.org/index.html/doc/trunk/www/inout.wiki to import a > git repo into fossil but when I open the repo it's missing many of my > changes. > > I have found the changes in the leaves section but I'm not sure how to > "apply" these to my repository so I have all my changes on the > filesystem so I can continue developing. > > How do I get the leaves into my repo so the files and changes appear? > > Can someone explain exactly what leaves are? How is one created? > (1) Which version of Fossil are you using. (What does [fossil help] tell you?) (2) Are you able to share either your Git or your converted Fossil repositories (or both) so that we can see exactly what you are talking about? (3) Further reading on "leaves and branches" from a Fossil point of view at http://www.fossil-scm.org/fossil/doc/trunk/www/branching.wiki > ___ > 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] Converting from a Git Repository
I followed the instructions on http://fossil-scm.org/index.html/doc/trunk/www/inout.wiki to import a git repo into fossil but when I open the repo it's missing many of my changes. I have found the changes in the leaves section but I'm not sure how to "apply" these to my repository so I have all my changes on the filesystem so I can continue developing. How do I get the leaves into my repo so the files and changes appear? Can someone explain exactly what leaves are? How is one created? ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] ticket system bug, additional columns
Hello All, There seems to be a bug in the ticket system. Could someone verify this. I added an "assigned_to" column into the fossil ticket system. When I edit a ticket's "assigned_to" column and comment, an artifact is generated (viewable in the admin/log page) but it does not seem to get applied to the ticket. With some experimentation I've noticed that the name of the column that you add and try to modify along with the comment field seems to be the culprit. For example if you create an "assigned_to" column, and try to edit it as well as the comment you generate an artifact like this (note that the "J" fieldnames seem to be alphabetized). It does not work: D 2010-11-15T23:38:35 J assigned_to eriklechak J +comment \n\neriklechak\sadded\son\s2010-11-15\s23:38:35:\nabcd K b8d3a9acb552bc11cc01483fcc710d6c994198e3 U eriklechak Z 9e9120a9d85b67a50280a96b04d117c6 However, if instead of creating an "assigned_to" column you create and "xassigned_to" column, and repeat the process of setting it and the comment you get this working artifact (note that the "xassigned_to" field comes after the "J +comment" field): D 2010-11-15T23:44:29 J +comment \n\neriklechak\sadded\son\s2010-11-15\s23:44:29:\ntyui J xassigned_to eriklechak K b8d3a9acb552bc11cc01483fcc710d6c994198e3 U eriklechak Z a5f5eb871eb8334469c721c11c000a11 With the "assigned_to" column, if the only thing you change is the "assigned_to" field it works as well: D 2010-11-15T23:39:32 J assigned_to eriklechak K b8d3a9acb552bc11cc01483fcc710d6c994198e3 U eriklechak Z 739866d3b7281ea4f0019f9352d22de1 This makes me think that any field added that alphabetically comes before "comment" or possibly any "J +fieldname" section can not be in the same artifact. --Erik Lechak ___ 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] Fossil - "github-in-a-box"
On 12 November 2010 20:53, Jeff Rogers wrote: > I was recently skimming over the book 'Producing Open Source Software" > and it suggests a set of tools that an open source project needs: > - web site > - mailing lists > - version control > - bug tracking > - real-time chat > (from http://producingoss.com/en/technical-infrastructure.html) > > Fossil already has three of these (website, vcs, bug tracking). While I > doubt the fossil maintainers would be interested in bloating fossil by > adding the other two items (mailing list management and real-time chat) > it would be an interesting project (perhaps for a hosting site) to > create a "oss community in a box" based on fossil. (project = fossil > repo + proj...@hosting.site mailing list + proj...@hosting.site jabber MUC). > It would be a project on its own to make a ML management software that does not suck and advertise it enough so that it is used. Most projects these days use GNU Mailman and like fossil's its web is broken by default and the list management functions also leave some things to be desired. Thanks Michal ___ 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] Wookoo! Google Code Wiki Syntax in fossil!
On 13 November 2010 11:43, Stephan Beal wrote: > On Sat, Nov 13, 2010 at 11:24 AM, Stephan Beal > wrote: >> >> Here's are full instructions, and they can easily be adapter to other >> JavaScript-based wiki syntax parsers: > > Okay, well, almost... the parser is mis-parsing some bits which it doesn't > mis-parse if i feed it the same day without it running through fossil. > Apparently some bytes are getting changed in a way which is incompatible > with the parser. > i see now that fossil is apparently still marking up [WikiWord|links] in > HTML, and that interferes with the parser. i figured that "all HTML" would > disable wiki links. So formatting which doesn't generate links works, but > fossil will still try to take over any [WikiStyle links]. That explains why > the intra-wiki links worked with fossil, even after being run through the > GoCo parser. > How feasible is an option to allow 100% unprocessed wiki content? > > You need to implement an option for that (or better make the current HTML option do really HTML). There was some discussion earlier and there are other people who would welcome true HTML in fossil. I would welcome a true wiki with formatting features on par with MediaWIki or markdown but that's another thing. Thanks Michal ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users