Re: [Geany-devel] Git conversion completed
Hi Randy, Le 09/10/2011 23:20, Randy Kramer a écrit : On Sunday 09 October 2011 11:59:47 am Colomban Wendling wrote: (speak within ~ the hour or be quiet forever :D) I have no comments about the git repository, but, with a project with participants possibly from around the world, one hour is not very much time to react. (Yes, I know that the test repository has been available longer than that, I just think it's something you need to consider in general (as the new Geany--well, whatever you are now--the official maintainer?).) You are right, and luckily I know it :) However, when I said anybody I meant Enrico, Jiří, Frank, etc., all I know were online or not far at the moment, as Enrico noted. I didn't think anybody else would have had something specific to say about the repository, and I didn't wanted to wait one more 24h to push the repo online. I'm sorry if it sounded rude, sorry. Regards, Colomban ___ Geany-devel mailing list Geany-devel@uvena.de https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
Re: [Geany-devel] Git conversion completed
On Sun, Oct 9, 2011 at 04:57, Matthew Brush mbr...@codebrainz.ca wrote: On 10/08/2011 05:13 PM, Jiří Techet wrote: Please have a good look at it. It's no problem to change it now but it will be hard once people start using it. For this reason please resist the temptation and don't update your branches on top of the repository yet. It's safer to wait until everyone agrees the repository is alright. It seems to be pretty good; the branches are nice and cleaned up, the tags look good, and the commit authors have the correct info to match up to their Github accounts. I don't know too much what else to look for though :) Yes, I think it's alright but the more eyes look at it, the better chance someone notices something wrong. Just for fun I tried to checkout and compile some very old versions of Geany. Until commit 3f0512 (post 0.8 commit) everything compiles and runs fine. For earlier versions you have to apply the patch from this commit - after that you can run even the very first import to the repository. And even with this old version you can say yes, this is Geany. Quite amazing that everything runs despite all the compiler and library changes during the years. Cheers, Jiri ___ Geany-devel mailing list Geany-devel@uvena.de https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
Re: [Geany-devel] Git conversion completed
Le 09/10/2011 02:13, Jiří Techet a écrit : Hi, I've completed the conversion to git. It went quite smoothly because I did it already before and fortunately the checksums remained the same so I could reuse the grafts files I already had (to be sure, I checked all the entries one by one). The repository is here: https://github.com/techee/geany Please have a good look at it. It's no problem to change it now but it will be hard once people start using it. For this reason please resist the temptation and don't update your branches on top of the repository yet. It's safer to wait until everyone agrees the repository is alright. Looks good, great job again! :) Just a few questions/remarks: * the unstable branch don't seem to be always removed after merging, yet it is re-created (4f20d88, 2f9719e). This seem not correct since according to svn, in both commits the branch was actually created. * why does 3155474 have two parents? It's supposed to be a new branch out of 3a4a5b6; the old build-system branch was removed in r3939 (previous rev). * 03c3b75 (r3679) is a bit weird too, it has d3cdd27 (r3680) as parent, but as the SVN revision suggests, d3cdd27 is newer than it (13:53:04 vs 13:45:47). And I don't see from SVN log why this would be wanted. Apart this, the rest looks just fine :) Cheers, Colomban ___ Geany-devel mailing list Geany-devel@uvena.de https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
Re: [Geany-devel] Git conversion completed
Le 09/10/2011 14:36, Jiří Techet a écrit : On Sun, Oct 9, 2011 at 13:55, Colomban Wendling lists@herbesfolles.org wrote: Le 09/10/2011 02:13, Jiří Techet a écrit : Hi, I've completed the conversion to git. It went quite smoothly because I did it already before and fortunately the checksums remained the same so I could reuse the grafts files I already had (to be sure, I checked all the entries one by one). The repository is here: https://github.com/techee/geany Please have a good look at it. It's no problem to change it now but it will be hard once people start using it. For this reason please resist the temptation and don't update your branches on top of the repository yet. It's safer to wait until everyone agrees the repository is alright. Looks good, great job again! :) Just a few questions/remarks: * the unstable branch don't seem to be always removed after merging, yet it is re-created (4f20d88, 2f9719e). This seem not correct since according to svn, in both commits the branch was actually created. * why does 3155474 have two parents? It's supposed to be a new branch out of 3a4a5b6; the old build-system branch was removed in r3939 (previous rev). These two are exactly the points 2 and 4 from http://lists.uvena.de/geany-devel/2011-September/005232.html Oops, my bad :o The problem is that svn2git doesn't delete the branch after merging it so when the branch is re-crated, it has two parents - the current trunk and the last commit from the branch before it was merged. This was the case both for the unstable branch and configurable menu branch which existed before already. I was asking whether to to fix these and the answer was that it's not so important but you're right it looks strange so I'll go through the repository and fix the most obvious cases. It's not much work anyway. I agree it's not so important, just looks a bit weird. If you can fix those easily it's cool, but if it's too hard just don't bother, it's not really a problem. * 03c3b75 (r3679) is a bit weird too, it has d3cdd27 (r3680) as parent, but as the SVN revision suggests, d3cdd27 is newer than it (13:53:04 vs 13:45:47). And I don't see from SVN log why this would be wanted. This is apparently my error - judging from the date I should have used d71d352 for merge trunk changes. I'll fix that. Great, looking forward to it. I think when this is done all is OK, so we could import it in the official repo :) Cheers, Colomban ___ Geany-devel mailing list Geany-devel@uvena.de https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
Re: [Geany-devel] Git conversion completed
On Sun, Oct 9, 2011 at 15:38, Colomban Wendling lists@herbesfolles.org wrote: Le 09/10/2011 14:36, Jiří Techet a écrit : On Sun, Oct 9, 2011 at 13:55, Colomban Wendling lists@herbesfolles.org wrote: Le 09/10/2011 02:13, Jiří Techet a écrit : Hi, I've completed the conversion to git. It went quite smoothly because I did it already before and fortunately the checksums remained the same so I could reuse the grafts files I already had (to be sure, I checked all the entries one by one). The repository is here: https://github.com/techee/geany Please have a good look at it. It's no problem to change it now but it will be hard once people start using it. For this reason please resist the temptation and don't update your branches on top of the repository yet. It's safer to wait until everyone agrees the repository is alright. Looks good, great job again! :) Just a few questions/remarks: * the unstable branch don't seem to be always removed after merging, yet it is re-created (4f20d88, 2f9719e). This seem not correct since according to svn, in both commits the branch was actually created. * why does 3155474 have two parents? It's supposed to be a new branch out of 3a4a5b6; the old build-system branch was removed in r3939 (previous rev). These two are exactly the points 2 and 4 from http://lists.uvena.de/geany-devel/2011-September/005232.html Oops, my bad :o The problem is that svn2git doesn't delete the branch after merging it so when the branch is re-crated, it has two parents - the current trunk and the last commit from the branch before it was merged. This was the case both for the unstable branch and configurable menu branch which existed before already. I was asking whether to to fix these and the answer was that it's not so important but you're right it looks strange so I'll go through the repository and fix the most obvious cases. It's not much work anyway. I agree it's not so important, just looks a bit weird. If you can fix those easily it's cool, but if it's too hard just don't bother, it's not really a problem. * 03c3b75 (r3679) is a bit weird too, it has d3cdd27 (r3680) as parent, but as the SVN revision suggests, d3cdd27 is newer than it (13:53:04 vs 13:45:47). And I don't see from SVN log why this would be wanted. This is apparently my error - judging from the date I should have used d71d352 for merge trunk changes. I'll fix that. Great, looking forward to it. I think when this is done all is OK, so we could import it in the official repo :) OK, I've re-uploaded the repositories to the same locations. I've fixed the incorrect merge issue and updated parents for most of the re-created branches. The only one I haven't updated is the Create branch for configurable build menu development, now commit 80d2802. There's something strange - it appears the branch existed before but it was never merged into trunk. Instead it was probably deleted and re-created again. If I updated the parent to be the trunk only, we'd lose the history of this branch because we couldn't get to the previous commits in any way. So I think it's better to keep it the way it is. Cheers, Jiri ___ Geany-devel mailing list Geany-devel@uvena.de https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
Re: [Geany-devel] Git conversion completed
Le 09/10/2011 16:49, Jiří Techet a écrit : On Sun, Oct 9, 2011 at 15:38, Colomban Wendling lists@herbesfolles.org wrote: Le 09/10/2011 14:36, Jiří Techet a écrit : On Sun, Oct 9, 2011 at 13:55, Colomban Wendling lists@herbesfolles.org wrote: [...] * 03c3b75 (r3679) is a bit weird too, it has d3cdd27 (r3680) as parent, but as the SVN revision suggests, d3cdd27 is newer than it (13:53:04 vs 13:45:47). And I don't see from SVN log why this would be wanted. This is apparently my error - judging from the date I should have used d71d352 for merge trunk changes. I'll fix that. Great, looking forward to it. I think when this is done all is OK, so we could import it in the official repo :) OK, I've re-uploaded the repositories to the same locations. I've fixed the incorrect merge issue and updated parents for most of the re-created branches. Yep, looks great, bravo! The only one I haven't updated is the Create branch for configurable build menu development, now commit 80d2802. There's something strange - it appears the branch existed before but it was never merged into trunk. Instead it was probably deleted and re-created again. If I updated the parent to be the trunk only, we'd lose the history of this branch because we couldn't get to the previous commits in any way. So I think it's better to keep it the way it is. OK, makes sense, even though the old build-system branch was dropped because it was corrupted (according to r3939: Removing corrupted branch). I also checked the repository against my own git-svn clone as you suggested, and all about 60 checkpoints in the history I checked did match, so I'm happy to see you didn't corrupt the sources ;) So, I'm thinking of committing this, anybody has something to object? (speak within ~ the hour or be quiet forever :D) If not I'll commit this to the official repo Matthew created for us (thanks!) and we'll be able to start messing around again ^^ Cheers, Colomban ___ Geany-devel mailing list Geany-devel@uvena.de https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
Re: [Geany-devel] Git conversion completed
On Sun, Oct 9, 2011 at 17:59, Colomban Wendling lists@herbesfolles.org wrote: Le 09/10/2011 16:49, Jiří Techet a écrit : On Sun, Oct 9, 2011 at 15:38, Colomban Wendling lists@herbesfolles.org wrote: Le 09/10/2011 14:36, Jiří Techet a écrit : On Sun, Oct 9, 2011 at 13:55, Colomban Wendling lists@herbesfolles.org wrote: [...] * 03c3b75 (r3679) is a bit weird too, it has d3cdd27 (r3680) as parent, but as the SVN revision suggests, d3cdd27 is newer than it (13:53:04 vs 13:45:47). And I don't see from SVN log why this would be wanted. This is apparently my error - judging from the date I should have used d71d352 for merge trunk changes. I'll fix that. Great, looking forward to it. I think when this is done all is OK, so we could import it in the official repo :) OK, I've re-uploaded the repositories to the same locations. I've fixed the incorrect merge issue and updated parents for most of the re-created branches. Yep, looks great, bravo! The only one I haven't updated is the Create branch for configurable build menu development, now commit 80d2802. There's something strange - it appears the branch existed before but it was never merged into trunk. Instead it was probably deleted and re-created again. If I updated the parent to be the trunk only, we'd lose the history of this branch because we couldn't get to the previous commits in any way. So I think it's better to keep it the way it is. OK, makes sense, even though the old build-system branch was dropped because it was corrupted (according to r3939: Removing corrupted branch). Ah, OK, I've overlooked this. If you want to make some more changes, create a file called grafts inside .git/info. Each line of this file has format parent child1 child2 child3... (using commit SHAs depending on number of children) When you're finished with your modifications, run git filter-branch --tag-name-filter cat -- --all to write it permanently into the repository. Remove the grafts file afterwards. I also checked the repository against my own git-svn clone as you suggested, and all about 60 checkpoints in the history I checked did match, so I'm happy to see you didn't corrupt the sources ;) And the remaining 5000 commits in between contain code which will erase your hard drive completely ;-). Cheers, Jiri ___ Geany-devel mailing list Geany-devel@uvena.de https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
Re: [Geany-devel] Git conversion completed
On Sun, 09 Oct 2011 17:59:47 +0200, Colomban wrote: Le 09/10/2011 16:49, Jiří Techet a écrit : On Sun, Oct 9, 2011 at 15:38, Colomban Wendling lists@herbesfolles.org wrote: Le 09/10/2011 14:36, Jiří Techet a écrit : On Sun, Oct 9, 2011 at 13:55, Colomban Wendling lists@herbesfolles.org wrote: [...] * 03c3b75 (r3679) is a bit weird too, it has d3cdd27 (r3680) as parent, but as the SVN revision suggests, d3cdd27 is newer than it (13:53:04 vs 13:45:47). And I don't see from SVN log why this would be wanted. This is apparently my error - judging from the date I should have used d71d352 for merge trunk changes. I'll fix that. Great, looking forward to it. I think when this is done all is OK, so we could import it in the official repo :) OK, I've re-uploaded the repositories to the same locations. I've fixed the incorrect merge issue and updated parents for most of the re-created branches. Yep, looks great, bravo! The only one I haven't updated is the Create branch for configurable build menu development, now commit 80d2802. There's something strange - it appears the branch existed before but it was never merged into trunk. Instead it was probably deleted and re-created again. If I updated the parent to be the trunk only, we'd lose the history of this branch because we couldn't get to the previous commits in any way. So I think it's better to keep it the way it is. OK, makes sense, even though the old build-system branch was dropped because it was corrupted (according to r3939: Removing corrupted branch). IIRC there were problems with the problems with the branch when Nick tried to merge it back into trunk with an older SVN client than the one the branch was created with. Or something like that. Maybe Lex remembers more details. If not, it's probably not that critical at all. So, I'm thinking of committing this, anybody has something to object? (speak within ~ the hour or be quiet forever :D) /me is quiet. Regards, Enrico -- Get my GPG key from http://www.uvena.de/pub.asc pgpzVOaCOwYfT.pgp Description: PGP signature ___ Geany-devel mailing list Geany-devel@uvena.de https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
Re: [Geany-devel] Git conversion completed
Le 09/10/2011 19:03, Jiří Techet a écrit : On Sun, Oct 9, 2011 at 17:59, Colomban Wendling lists@herbesfolles.org wrote: Le 09/10/2011 16:49, Jiří Techet a écrit : On Sun, Oct 9, 2011 at 15:38, Colomban Wendling lists@herbesfolles.org wrote: Le 09/10/2011 14:36, Jiří Techet a écrit : On Sun, Oct 9, 2011 at 13:55, Colomban Wendling lists@herbesfolles.org wrote: [...] * 03c3b75 (r3679) is a bit weird too, it has d3cdd27 (r3680) as parent, but as the SVN revision suggests, d3cdd27 is newer than it (13:53:04 vs 13:45:47). And I don't see from SVN log why this would be wanted. This is apparently my error - judging from the date I should have used d71d352 for merge trunk changes. I'll fix that. Great, looking forward to it. I think when this is done all is OK, so we could import it in the official repo :) OK, I've re-uploaded the repositories to the same locations. I've fixed the incorrect merge issue and updated parents for most of the re-created branches. Yep, looks great, bravo! The only one I haven't updated is the Create branch for configurable build menu development, now commit 80d2802. There's something strange - it appears the branch existed before but it was never merged into trunk. Instead it was probably deleted and re-created again. If I updated the parent to be the trunk only, we'd lose the history of this branch because we couldn't get to the previous commits in any way. So I think it's better to keep it the way it is. OK, makes sense, even though the old build-system branch was dropped because it was corrupted (according to r3939: Removing corrupted branch). Ah, OK, I've overlooked this. If you want to make some more changes, create a file called grafts inside .git/info. Each line of this file has format parent child1 child2 child3... (using commit SHAs depending on number of children) Isn't it rather child parent1 parent2...? Looks like it does a better job, if I understand the result correctly ^^ anyway, thanks for the tips :) Anyway I chosen to keep the previous branch as you did it so there is some more history, yet it is strange. BTW, pushed to https://github.com/geany/geany :) -- this is not yet a wide announcement because there is a few thing to tune, update qtuff, but it's up and running. When you're finished with your modifications, run git filter-branch --tag-name-filter cat -- --all to write it permanently into the repository. Remove the grafts file afterwards. I also checked the repository against my own git-svn clone as you suggested, and all about 60 checkpoints in the history I checked did match, so I'm happy to see you didn't corrupt the sources ;) And the remaining 5000 commits in between contain code which will erase your hard drive completely ;-). Yep, and you're a so great mind-reader you you knew very well which commits I would check :p Cheers, Colomban ___ Geany-devel mailing list Geany-devel@uvena.de https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
Re: [Geany-devel] Git conversion completed
On Sunday 09 October 2011 11:59:47 am Colomban Wendling wrote: (speak within ~ the hour or be quiet forever :D) I have no comments about the git repository, but, with a project with participants possibly from around the world, one hour is not very much time to react. (Yes, I know that the test repository has been available longer than that, I just think it's something you need to consider in general (as the new Geany--well, whatever you are now--the official maintainer?).) Randy Kramer ___ Geany-devel mailing list Geany-devel@uvena.de https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
Re: [Geany-devel] Git conversion completed
On Sun, 9 Oct 2011 17:20:16 -0400, Randy wrote: On Sunday 09 October 2011 11:59:47 am Colomban Wendling wrote: (speak within ~ the hour or be quiet forever :D) I have no comments about the git repository, but, with a project with participants possibly from around the world, one hour is not very much time to react. True. But waiting another two days just to wait for all the various people around the globe wouldn't have made it better. In fact, all evolved people like Colomban, Matthew, Jiri, Frank, me, were online at that time and (except Matthew) in the same time zone. (Yes, I know that the test repository has been available longer than that, I just think it's something you need to consider in general (as the new Geany--well, whatever you are now--the official maintainer? Colomban is the official maintainer, nothing whatever. Regards, Enrico -- Get my GPG key from http://www.uvena.de/pub.asc pgpVgodVM4hBu.pgp Description: PGP signature ___ Geany-devel mailing list Geany-devel@uvena.de https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
Re: [Geany-devel] Git conversion completed
On Sunday 09 October 2011 05:27:47 pm Enrico Tröger wrote: On Sun, 9 Oct 2011 17:20:16 -0400, Randy wrote: (Yes, I know that the test repository has been available longer than that, I just think it's something you need to consider in general (as the new Geany--well, whatever you are now--the official maintainer? Colomban is the official maintainer, nothing whatever. Just to be clear, I did not intend any disrespect, I just could not remember what role Colomban had taken on. Randy Kramer ___ Geany-devel mailing list Geany-devel@uvena.de https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
Re: [Geany-devel] Git conversion completed
On 10/08/2011 05:13 PM, Jiří Techet wrote: Please have a good look at it. It's no problem to change it now but it will be hard once people start using it. For this reason please resist the temptation and don't update your branches on top of the repository yet. It's safer to wait until everyone agrees the repository is alright. It seems to be pretty good; the branches are nice and cleaned up, the tags look good, and the commit authors have the correct info to match up to their Github accounts. I don't know too much what else to look for though :) Cheers, Matthew Brush ___ Geany-devel mailing list Geany-devel@uvena.de https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
