Re: Git Migration: github with svn access
On 15-01-13 03:36, Yawar Amin wrote: Hi Geert, On 2012-08-13 05:57, Geert Janssens wrote: [...] [1] http://wiki.gnucash.org/wiki/Git-bz Git-bz does look useful to me. People that want to submit patches without having commit access can install this locally. At first sight it doesn't seem to create new bugs if the patch you wish to publish is not related to an existing bug. That may be a drawback. I know I'm _really_ late with this reply, but git-bz actually does create new bugs using the git-bz file command. I've updated the wiki page to clarify that. Regards, Yawar Great ! Thanks for the update (still better late than never:) ) Geert ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
Hi Geert, On 2012-08-13 05:57, Geert Janssens wrote: [...] [1] http://wiki.gnucash.org/wiki/Git-bz Git-bz does look useful to me. People that want to submit patches without having commit access can install this locally. At first sight it doesn't seem to create new bugs if the patch you wish to publish is not related to an existing bug. That may be a drawback. I know I'm _really_ late with this reply, but git-bz actually does create new bugs using the git-bz file command. I've updated the wiki page to clarify that. Regards, Yawar signature.asc Description: OpenPGP digital signature ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
Geert Janssens wrote On 13-08-12 11:33, reubano wrote: reubano wrote On Sat, Aug 11, 2012 at 9:34 PM, Derek Atkins lt;warlord@gt; wrote: Reuben Cummings lt;reubano@gt; writes: Gnucash is following the Gnome patch submission practice. Gnome uses git, but not Github, and doesn't use pull requests (which are actually designed to work through email with, guess what, git format-patch). I hope that even after we migrate to git we'll continue with the same submission practice. Is there any way both could work together? I've been reading a bit on the shortcomings of GitHub PRs [1] and am curious if any combination of git-request-pull [2], .patch URL [3], or patches-by-email [4] could work. [1] https://github.com/torvalds/linux/pull/17#issuecomment-5654674 [2] http://git-scm.com/docs/git-request-pull [3] https://help.github.com/articles/using-pull-requests/ (Patch and Apply section) [4] http://alblue.bandlem.com/2011/12/git-tip-of-week-patches-by-email.html I also just read about git-bz [1] (linked from the git wiki). It looks promising as well. If there was some way to integrate OAuth it seems like it could even be ideal. Thoughts? [1] http://wiki.gnucash.org/wiki/Git-bz Git-bz does look useful to me. People that want to submit patches without having commit access can install this locally. At first sight it doesn't seem to create new bugs if the patch you wish to publish is not related to an existing bug. That may be a drawback. Geert PyBugz[1] may do the trick [1] https://github.com/williamh/pybugz -- View this message in context: http://gnucash.1415818.n4.nabble.com/Git-Migration-tp3996329p4656355.html Sent from the GnuCash - Dev mailing list archive at Nabble.com. ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
On Sat, Aug 11, 2012 at 9:34 PM, Derek Atkins warl...@mit.edu wrote: Reuben Cummings reub...@gmail.com writes: Yes, I figured the round-a-bout patch submission method is due to maintain svn compatibility. But that still doesn't answer my original question of a time-frame for full github integration. A perfectly acceptable answer is No, gnucash will never be fully integrated with github because we want to maintain svn access. If that is the case, then so be it. Okay, I'll state it for you. No, gnucash will never be fully integrated with github. Not necessarily because we want to maintain SVN access, but because we want to maintain the master code repository. Even if we do switch to 100% git, we will never be fully integrated with github. -derek Ok, thanks for answering. On Sat, Aug 11, 2012 at 5:25 PM, John Ralls jra...@ceridwen.us wrote: You misunderstand the warnings about forking. Notice that I have a gnucash fork in my Github repos. Works fine, fails safe, and drains to the bilge. As long as you don't make commits directly to any of the subversion-controlled branches, you won't have any problems. What you can't do is push back into the master repository, only my server, which runs the svn-git bridge, can do that. So if that is the case then the wiki should probably be edited. Right now it says If you have a Github account, it turns out that Github's fork feature doesn't play well with the Gnucash repository because of its unusual structure (which in turn is needed to synch it with subversion). This doesn't make it clear that forking is ok in some circumstances. And if I'm understanding you, I should be able to: fork clone (my personal fork) git branch -t master refs/remotes/origin/trunk git branch working write code git rebase master working git format-patch git push -u origin master ... Is this correct? If so, I think the wiki could be cleaned up and simplified a bit. As is, the 'Set-Up' and 'Patches' sections give conflicting steps and are overall confusing, e.g., Set-Up says git branch -t master refs/remotes/origin/trunk ... git format-patch origin/trunk..master but 'Patches' says git checkout trunk git branch working-trunk ... git format-patch trunk My suggestion is to have 'Basic (GitHub) Set-Up' and 'Advance (Non GitHub) Set-Up' sections to accommodate the cloning differences, i.e., git clone git://github.com/Gnucash/gnucash.git git remote add myname-github remote server:myname/gnucash.git vs fork git clone https://github.com/user/gnucash.git (just list HTTPS assuming those who want SSH will already know how to do it) And then have a 'Contributing Code' section beginning with branching instructions. *OR* to make it even simpler, just list everything for a GitHub setup first and the at the end add a note for those who don't use GitHub to clone and then git remote add. Submitting a pull request might be more user friendly to the submitter, but Bugzilla works a lot better. Github's issue tracking *sucks*, and pull requests are a flavor of issues. Ok, I'll take your word on that since I have little experience with either. Gnucash is following the Gnome patch submission practice. Gnome uses git, but not Github, and doesn't use pull requests (which are actually designed to work through email with, guess what, git format-patch). I hope that even after we migrate to git we'll continue with the same submission practice. Is there any way both could work together? I've been reading a bit on the shortcomings of GitHub PRs [1] and am curious if any combination of git-request-pull [2], .patch URL [3], or patches-by-email [4] could work. [1] https://github.com/torvalds/linux/pull/17#issuecomment-5654674 [2] http://git-scm.com/docs/git-request-pull [3] https://help.github.com/articles/using-pull-requests/ (Patch and Apply section) [4] http://alblue.bandlem.com/2011/12/git-tip-of-week-patches-by-email.html ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
reubano wrote On Sat, Aug 11, 2012 at 9:34 PM, Derek Atkins lt;warl...@mit.edugt; wrote: Reuben Cummings lt;reub...@gmail.comgt; writes: Gnucash is following the Gnome patch submission practice. Gnome uses git, but not Github, and doesn't use pull requests (which are actually designed to work through email with, guess what, git format-patch). I hope that even after we migrate to git we'll continue with the same submission practice. Is there any way both could work together? I've been reading a bit on the shortcomings of GitHub PRs [1] and am curious if any combination of git-request-pull [2], .patch URL [3], or patches-by-email [4] could work. [1] https://github.com/torvalds/linux/pull/17#issuecomment-5654674 [2] http://git-scm.com/docs/git-request-pull [3] https://help.github.com/articles/using-pull-requests/ (Patch and Apply section) [4] http://alblue.bandlem.com/2011/12/git-tip-of-week-patches-by-email.html I also just read about git-bz [1] (linked from the git wiki). It looks promising as well. If there was some way to integrate OAuth it seems like it could even be ideal. Thoughts? [1] http://wiki.gnucash.org/wiki/Git-bz -- View this message in context: http://gnucash.1415818.n4.nabble.com/Git-Migration-tp3996329p4656187.html Sent from the GnuCash - Dev mailing list archive at Nabble.com. ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
On 11-08-12 20:36, Derek Atkins wrote Any chance we could rename this Git Migration instead of Github Migration? I don't think we will ever full migrate fully to github. I just think it's a bad idea to let go of master. (I tried sending a message like this this morning but it doesn't appear to have left my phone. Or I just missed it). I have renamed the page and started a section for the ongoing discussion on github vs code.gnucash.org hosting. I have added arguments pro and con as I see them so far (and what I've read on the list). Please state your own pro and con ideas as well so we can complete the full picture. You can do so either directly on the wiki page (but ping people on the list if you did so) or on the list. I'll add the additional info in the wiki then. As for my personal preference, if we can solve the technical issues regarding our scripting hooks, I'd prefer to move to github as well. As long as there are multiple active developers working from a cloned git, we don't have to worry about integrity (each one has his own private copy of master that can easily be compared if needed). This is inherent to git. The advantages I see with github is more visibility and a lower treshold to cloning (forking as github calls it), which directly increases the chance of contributions. Geert ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
On 13-08-12 11:33, reubano wrote: reubano wrote On Sat, Aug 11, 2012 at 9:34 PM, Derek Atkins lt;warl...@mit.edugt; wrote: Reuben Cummings lt;reub...@gmail.comgt; writes: Gnucash is following the Gnome patch submission practice. Gnome uses git, but not Github, and doesn't use pull requests (which are actually designed to work through email with, guess what, git format-patch). I hope that even after we migrate to git we'll continue with the same submission practice. Is there any way both could work together? I've been reading a bit on the shortcomings of GitHub PRs [1] and am curious if any combination of git-request-pull [2], .patch URL [3], or patches-by-email [4] could work. [1] https://github.com/torvalds/linux/pull/17#issuecomment-5654674 [2] http://git-scm.com/docs/git-request-pull [3] https://help.github.com/articles/using-pull-requests/ (Patch and Apply section) [4] http://alblue.bandlem.com/2011/12/git-tip-of-week-patches-by-email.html I also just read about git-bz [1] (linked from the git wiki). It looks promising as well. If there was some way to integrate OAuth it seems like it could even be ideal. Thoughts? [1] http://wiki.gnucash.org/wiki/Git-bz Git-bz does look useful to me. People that want to submit patches without having commit access can install this locally. At first sight it doesn't seem to create new bugs if the patch you wish to publish is not related to an existing bug. That may be a drawback. Geert ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
Christian Stimming-4 wrote Am Freitag, 27. Januar 2012, 19:04:10 schrieb Andy Clayton: If I have some time during the next days, I'll look into porting the SVN- dependencies in our build scripts to using git. Also, I don't think it's necessary to distinguish tags that should trigger a build from those which don't - we can just as well have *each* tag trigger a rebuild on its own. The build server just needs a list of tag and SHA1. Is the switch to git stuck on 1) the sed crash on windows after adding git and then 2) porting the build scripts? Yes, both. The porting of the build scripts is a task that I thought I could look into, but don't have had time for it so far. The sed crash indicates a conflict of msys-git's msys environment with the build server's main msys environment. Maybe we can live with that by calling git by its absolute path so that its msys DLLs are not in PATH, but I haven't checked this further. Regards, Christian I'm glad you guys have migrated to Git/GitHub. I definitely think this will open up the doors for new contributors (myself included). I know full GitHub integration will take time, but can someone comment on the time-frame for this, i.e. being able to fork the gnucash repo and submit pull requests from within GitHub? -- View this message in context: http://gnucash.1415818.n4.nabble.com/Git-Migration-tp3996329p4656125.html Sent from the GnuCash - Dev mailing list archive at Nabble.com. ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
Hi, Am 11.08.2012 09:17, schrieb reubano: : I'm glad you guys have migrated to Git/GitHub. I definitely think this will open up the doors for new contributors (myself included). I know full GitHub integration will take time, but can someone comment on the time-frame for this, i.e. being able to fork the gnucash repo and submit pull requests from within GitHub? http://wiki.gnucash.org/wiki/Git Where is the Problem? ;-) Frank ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
On Sat, Aug 11, 2012 at 10:49 AM, Frank H. Ellenberger frank.h.ellenber...@gmail.com wrote: Hi, Am 11.08.2012 09:17, schrieb reubano: : I'm glad you guys have migrated to Git/GitHub. I definitely think this will open up the doors for new contributors (myself included). I know full GitHub integration will take time, but can someone comment on the time-frame for this, i.e. being able to fork the gnucash repo and submit pull requests from within GitHub? http://wiki.gnucash.org/wiki/Git Where is the Problem? ;-) Frank Yes, I have read that. Look at the directions for sending a patch and notice the comment that forking github projects doesn't work. Compare that to the widespread github work-flow of forking a repo, committing changes, and then submitting a pull request. The latter is *much* more user friendly than manually creating patches, logging into bugzilla, filling a bug, submitting a patch... ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
Hi Reuben, Am 11.08.2012 09:55, schrieb Reuben Cummings: On Sat, Aug 11, 2012 at 10:49 AM, Frank H. Ellenberger frank.h.ellenber...@gmail.com wrote: : http://wiki.gnucash.org/wiki/Git Where is the Problem? ;-) Frank Yes, I have read that. Look at the directions for sending a patch and notice the comment that forking github projects doesn't work. Compare that to the widespread github work-flow of forking a repo, committing changes, and then submitting a pull request. The latter is *much* more user friendly than manually creating patches, logging into bugzilla, filling a bug, submitting a patch... Because of http://wiki.gnucash.org/wiki/Subversion#SVN_write_access the first time you should send your patches via bugzilla. When I tested git, it was easy really easy to submit patches. But in between, because I prefer revision numbers over hashes, I stick with svn. Once configured in http://wiki.gnucash.org/wiki/Eclipse also easy to use. Frank ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
On Sat, Aug 11, 2012 at 11:08 AM, Frank H. Ellenberger frank.h.ellenber...@gmail.com wrote: Hi Reuben, Am 11.08.2012 09:55, schrieb Reuben Cummings: On Sat, Aug 11, 2012 at 10:49 AM, Frank H. Ellenberger frank.h.ellenber...@gmail.com wrote: : http://wiki.gnucash.org/wiki/Git Where is the Problem? ;-) Frank Yes, I have read that. Look at the directions for sending a patch and notice the comment that forking github projects doesn't work. Compare that to the widespread github work-flow of forking a repo, committing changes, and then submitting a pull request. The latter is *much* more user friendly than manually creating patches, logging into bugzilla, filling a bug, submitting a patch... Because of http://wiki.gnucash.org/wiki/Subversion#SVN_write_access the first time you should send your patches via bugzilla. Yes, I figured the round-a-bout patch submission method is due to maintain svn compatibility. But that still doesn't answer my original question of a time-frame for full github integration. A perfectly acceptable answer is No, gnucash will never be fully integrated with github because we want to maintain svn access. If that is the case, then so be it. I do understand that there are many legacy developers on svn, but if you do truly wish to expand the development base, I think full github integration is the way to go. I'm not intending to start a flame war on git vs. svn. I'm just saying that (1) the current barrier to entry for contributing code to gnucash [1] via github is significantly higher than it is for other mainstream repos, i.e., jekyll [2] and (2) discouraging forking is very anti git IMHO (not to mention that it also diminishes gnucash's popularity on github). If you are aware of and accept those drawbacks as a trade-off for supporting svn, then please say so. If not, then I'm sure the gnucash community could try to figure out the best long term solution. I'm by no means an expert in git but am happy to contribute my ideas as a user. [1] https://github.com/Gnucash/gnucash [2] https://github.com/mojombo/jekyll When I tested git, it was easy really easy to submit patches. But in between, because I prefer revision numbers over hashes, I stick with svn. Once configured in http://wiki.gnucash.org/wiki/Eclipse also easy to use. Thanks for the link but I prefer coding in text editors as opposed to IDEs. ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
On 11-08-12 10:32, Reuben Cummings wrote: On Sat, Aug 11, 2012 at 11:08 AM, Frank H. Ellenberger frank.h.ellenber...@gmail.com wrote: Hi Reuben, Am 11.08.2012 09:55, schrieb Reuben Cummings: On Sat, Aug 11, 2012 at 10:49 AM, Frank H. Ellenberger frank.h.ellenber...@gmail.com wrote: : http://wiki.gnucash.org/wiki/Git Where is the Problem? ;-) Frank Yes, I have read that. Look at the directions for sending a patch and notice the comment that forking github projects doesn't work. Compare that to the widespread github work-flow of forking a repo, committing changes, and then submitting a pull request. The latter is *much* more user friendly than manually creating patches, logging into bugzilla, filling a bug, submitting a patch... Because of http://wiki.gnucash.org/wiki/Subversion#SVN_write_access the first time you should send your patches via bugzilla. Yes, I figured the round-a-bout patch submission method is due to maintain svn compatibility. But that still doesn't answer my original question of a time-frame for full github integration. A perfectly acceptable answer is No, gnucash will never be fully integrated with github because we want to maintain svn access. If that is the case, then so be it. Many things have been said already about migrating from svn to git on the lists. I'll try to summarize what has been mostly agreed upon and the current status (as I remember it). Others can voice their opinion if they don't agree with me here: I think most of the currently active developers more or less agree that full git integration is where GnuCash is heading. Regarding timing, I think most agree this would be good to get ready before the 2.6 release. The reason it hasn't happened yet is mostly our support for a Windows version of GnuCash. There are currently two problems still with the Windows version of GnuCash that have to be resolved: 1. To build GnuCash on Windows, the developers have written a number of scripts [1] to (mostly) automate the build on that platform. These scripts still need some tweaks to work properly with git [2] 2. We have an automated build server that builds Windows versions of GnuCash every night. This is driven by an additional set of scripts [3]. These scripts currently still rely heavily on svn and should be modified/extended to also work with git. [4] To avoid destabilizing the Windows build, and since it is the Windows build system that is most affected by a full git migration, it was also said that the 2.4 branch should remain maintained in svn for its lifetime if possible. Only trunk (and hence 2.6) would migrate. There has also been talk of github's svn bridge and use that as a fallback. I have played with it a couple of times, but it had some drawbacks, so I personally wouldn't depend on it for the Windows automated build. It's been a while since I tested so perhaps it works better now. If I remembered something incorrectly here, please voice it. Other than that, if you like to see this happen soon you are invited to jump in and fill the gaps as described below in the notes. Geert [1] The scripts can be found in http://svn.gnucash.org/trac/browser/gnucash/trunk/packaging/win32 [2] The only thing currently missing is the equivalent of running svn update (found in install-impl.sh) when the user has set the option UPDATE_SOURCES. It was agreed that our custom git-update script could be used, but no one so far made the actual code changes required for this. [3] The scripts can also be found in http://svn.gnucash.org/trac/browser/gnucash/trunk/packaging/win32 [4] Starting with daily_build.bat it calls a whole series of scripts, which involve svn checkouts, reading tag commits, and so on. For all this, equivalent features using git have to be written still. ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
On 11-08-12 11:24, Geert Janssens wrote: Many things have been said already about migrating from svn to git on the lists. I'll try to summarize what has been mostly agreed upon and the current status (as I remember it). Others can voice their opinion if they don't agree with me here: I think most of the currently active developers more or less agree that full git integration is where GnuCash is heading. Regarding timing, I think most agree this would be good to get ready before the 2.6 release. From rereading older mailing list messages, I can already add there are other parts of the code that have to be ported or replaced: - website updates happen whenever a change is committed to the gnucash htdocs svn repo. This has to be rewritten to work with github as well. I don't know where the hook script is located. I believe it's not a public script (for security reasons). - there are also scripts build the gnucash documentation and the doxygen documentation every night that depend on svn. Also here, I don't know where these scripts reside. Geert ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
I have created a wiki page to track the progress of our git migration. It currently lists the things I know that still have to be done. Please add to it if you know more or have fixed some items: http://wiki.gnucash.org/wiki/Github_Migration Geert ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
Hoi, Am 11.08.2012 12:17, schrieb Geert Janssens: I have created a wiki page to track the progress of our git migration. It currently lists the things I know that still have to be done. Please add to it if you know more or have fixed some items: http://wiki.gnucash.org/wiki/Github_Migration Geert Linked by http://wiki.gnucash.org/wiki/Git. ;-) Frank ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
On 11-08-12 12:48, Frank H. Ellenberger wrote: Hoi, Am 11.08.2012 12:17, schrieb Geert Janssens: I have created a wiki page to track the progress of our git migration. It currently lists the things I know that still have to be done. Please add to it if you know more or have fixed some items: http://wiki.gnucash.org/wiki/Github_Migration Geert Linked by http://wiki.gnucash.org/wiki/Git. ;-) Frank Thanks :) Geert ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
Could we rename this page Git Migration? Personally I never want github to be the canonical source. I think the canonical version should reside on code.GnuCash.org. We can still use github as backup and public dist, but iq think we should still maintain master. -derek Sent from my HTC smartphone - Reply message - From: Geert Janssens janssens-ge...@telenet.be To: Frank H. Ellenberger frank.h.ellenber...@gmail.com Cc: gnucash-devel@gnucash.org Subject: Git Migration: github with svn access Date: Sat, Aug 11, 2012 6:52 AM On 11-08-12 12:48, Frank H. Ellenberger wrote: Hoi, Am 11.08.2012 12:17, schrieb Geert Janssens: I have created a wiki page to track the progress of our git migration. It currently lists the things I know that still have to be done. Please add to it if you know more or have fixed some items: http://wiki.gnucash.org/wiki/Github_Migration Geert Linked by http://wiki.gnucash.org/wiki/Git. ;-) Frank Thanks :) Geert ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
If GnuCash switches to git, can I request that the gnc_authors file be corrected with my name and email for username 'chris'? -chris On Sat, Aug 11, 2012 at 08:05:08AM -0400, Derek Atkins wrote: Could we rename this page Git Migration? Personally I never want github to be the canonical source. I think the canonical version should reside on code.GnuCash.org. We can still use github as backup and public dist, but iq think we should still maintain master. -derek Sent from my HTC smartphone - Reply message - From: Geert Janssens janssens-ge...@telenet.be To: Frank H. Ellenberger frank.h.ellenber...@gmail.com Cc: gnucash-devel@gnucash.org Subject: Git Migration: github with svn access Date: Sat, Aug 11, 2012 6:52 AM On 11-08-12 12:48, Frank H. Ellenberger wrote: Hoi, Am 11.08.2012 12:17, schrieb Geert Janssens: I have created a wiki page to track the progress of our git migration. It currently lists the things I know that still have to be done. Please add to it if you know more or have fixed some items: http://wiki.gnucash.org/wiki/Github_Migration Geert Linked by http://wiki.gnucash.org/wiki/Git. ;-) Frank Thanks :) Geert ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
Why wait? -derek Sent from my HTC smartphone - Reply message - From: Chris Shoemaker c.shoema...@cox.net To: Derek Atkins de...@ihtfp.com Cc: Geert Janssens janssens-ge...@telenet.be, Frank H. Ellenberger frank.h.ellenber...@gmail.com, gnucash-devel@gnucash.org Subject: Git Migration: github with svn access Date: Sat, Aug 11, 2012 8:12 AM If GnuCash switches to git, can I request that the gnc_authors file be corrected with my name and email for username 'chris'? -chris On Sat, Aug 11, 2012 at 08:05:08AM -0400, Derek Atkins wrote: Could we rename this page Git Migration? Personally I never want github to be the canonical source. I think the canonical version should reside on code.GnuCash.org. We can still use github as backup and public dist, but iq think we should still maintain master. -derek Sent from my HTC smartphone - Reply message - From: Geert Janssens janssens-ge...@telenet.be To: Frank H. Ellenberger frank.h.ellenber...@gmail.com Cc: gnucash-devel@gnucash.org Subject: Git Migration: github with svn access Date: Sat, Aug 11, 2012 6:52 AM On 11-08-12 12:48, Frank H. Ellenberger wrote: Hoi, Am 11.08.2012 12:17, schrieb Geert Janssens: I have created a wiki page to track the progress of our git migration. It currently lists the things I know that still have to be done. Please add to it if you know more or have fixed some items: http://wiki.gnucash.org/wiki/Github_Migration Geert Linked by http://wiki.gnucash.org/wiki/Git. ;-) Frank Thanks :) Geert ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
Am 11.08.2012 15:33, schrieb Chris Shoemaker: Hi Frank, Sorry, I was referring to gnc_authors, not AUTHORS: https://github.com/Gnucash/git-helper-scripts/blob/master/gnc_authors Ah, some github specific file. Then somebody else has to do the job. I was trying to reuse some date-handling code I wrote awhile ago, and I had trouble finding it in the git repo, because of the name mixup. -chris Frank ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
On Aug 11, 2012, at 12:55 AM, Reuben Cummings reub...@gmail.com wrote: On Sat, Aug 11, 2012 at 10:49 AM, Frank H. Ellenberger frank.h.ellenber...@gmail.com wrote: Hi, Am 11.08.2012 09:17, schrieb reubano: : I'm glad you guys have migrated to Git/GitHub. I definitely think this will open up the doors for new contributors (myself included). I know full GitHub integration will take time, but can someone comment on the time-frame for this, i.e. being able to fork the gnucash repo and submit pull requests from within GitHub? http://wiki.gnucash.org/wiki/Git Where is the Problem? ;-) Frank Yes, I have read that. Look at the directions for sending a patch and notice the comment that forking github projects doesn't work. Compare that to the widespread github work-flow of forking a repo, committing changes, and then submitting a pull request. The latter is *much* more user friendly than manually creating patches, logging into bugzilla, filling a bug, submitting a patch... You misunderstand the warnings about forking. Notice that I have a gnucash fork in my Github repos. Works fine, fails safe, and drains to the bilge. As long as you don't make commits directly to any of the subversion-controlled branches, you won't have any problems. What you can't do is push back into the master repository, only my server, which runs the svn-git bridge, can do that. Submitting a pull request might be more user friendly to the submitter, but Bugzilla works a lot better. Github's issue tracking *sucks*, and pull requests are a flavor of issues. Gnucash is following the Gnome patch submission practice. Gnome uses git, but not Github, and doesn't use pull requests (which are actually designed to work through email with, guess what, git format-patch). I hope that even after we migrate to git we'll continue with the same submission practice. Regards, John Ralls ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
John, On Sat, August 11, 2012 10:25 am, John Ralls wrote: On Aug 11, 2012, at 12:55 AM, Reuben Cummings reub...@gmail.com wrote: On Sat, Aug 11, 2012 at 10:49 AM, Frank H. Ellenberger frank.h.ellenber...@gmail.com wrote: Hi, Am 11.08.2012 09:17, schrieb reubano: : I'm glad you guys have migrated to Git/GitHub. I definitely think this will open up the doors for new contributors (myself included). I know full GitHub integration will take time, but can someone comment on the time-frame for this, i.e. being able to fork the gnucash repo and submit pull requests from within GitHub? http://wiki.gnucash.org/wiki/Git Where is the Problem? ;-) Frank Yes, I have read that. Look at the directions for sending a patch and notice the comment that forking github projects doesn't work. Compare that to the widespread github work-flow of forking a repo, committing changes, and then submitting a pull request. The latter is *much* more user friendly than manually creating patches, logging into bugzilla, filling a bug, submitting a patch... You misunderstand the warnings about forking. Notice that I have a gnucash fork in my Github repos. Works fine, fails safe, and drains to the bilge. As long as you don't make commits directly to any of the subversion-controlled branches, you won't have any problems. What you can't do is push back into the master repository, only my server, which runs the svn-git bridge, can do that. Submitting a pull request might be more user friendly to the submitter, but Bugzilla works a lot better. Github's issue tracking *sucks*, and pull requests are a flavor of issues. Gnucash is following the Gnome patch submission practice. Gnome uses git, but not Github, and doesn't use pull requests (which are actually designed to work through email with, guess what, git format-patch). I hope that even after we migrate to git we'll continue with the same submission practice. My hope is that we do not change our process, just make it easier for people to work with the code. Regards, John Ralls -derek -- Derek Atkins 617-623-3745 de...@ihtfp.com www.ihtfp.com Computer and Internet Security Consultant ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
Reuben Cummings reub...@gmail.com writes: Yes, I figured the round-a-bout patch submission method is due to maintain svn compatibility. But that still doesn't answer my original question of a time-frame for full github integration. A perfectly acceptable answer is No, gnucash will never be fully integrated with github because we want to maintain svn access. If that is the case, then so be it. Okay, I'll state it for you. No, gnucash will never be fully integrated with github. Not necessarily because we want to maintain SVN access, but because we want to maintain the master code repository. Even if we do switch to 100% git, we will never be fully integrated with github. -derek -- Derek Atkins, SB '93 MIT EE, SM '95 MIT Media Laboratory Member, MIT Student Information Processing Board (SIPB) URL: http://web.mit.edu/warlord/PP-ASEL-IA N1NWH warl...@mit.eduPGP key available ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
Geert Janssens janssens-ge...@telenet.be writes: On 11-08-12 12:48, Frank H. Ellenberger wrote: Hoi, Am 11.08.2012 12:17, schrieb Geert Janssens: I have created a wiki page to track the progress of our git migration. It currently lists the things I know that still have to be done. Please add to it if you know more or have fixed some items: http://wiki.gnucash.org/wiki/Github_Migration Geert Linked by http://wiki.gnucash.org/wiki/Git. ;-) Frank Thanks :) Any chance we could rename this Git Migration instead of Github Migration? I don't think we will ever full migrate fully to github. I just think it's a bad idea to let go of master. (I tried sending a message like this this morning but it doesn't appear to have left my phone. Or I just missed it). Geert -derek -- Derek Atkins, SB '93 MIT EE, SM '95 MIT Media Laboratory Member, MIT Student Information Processing Board (SIPB) URL: http://web.mit.edu/warlord/PP-ASEL-IA N1NWH warl...@mit.eduPGP key available ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
On Aug 11, 2012, at 5:12 AM, Chris Shoemaker c.shoema...@cox.net wrote: If GnuCash switches to git, can I request that the gnc_authors file be corrected with my name and email for username 'chris'? Done, but it won't have any effect unless you commit a new change. Fixing it in the repository would make an enormous mess for everyone who's cloned it. Sorry. Regards, John Ralls ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
Hi Andy, Christian Stimming christ...@cstimming.de writes: Am Dienstag, 21. Februar 2012, 12:20:06 schrieb Andy Clayton: Thanks for the update. I tried getting gnucash to build on windows 7 in a virtualbox VM so I could look into this and other issues, but performace was horrible. Configuring and compiling a single dependency took hours. Apparently this is somewhat expected even without the VM because fork isn't cheap on windows, but I am wondering what others have found. Are things any better with the official vmware builder? Or has anyone tried and had better luck with KVM instead of virtualbox? I have also read that Windows 7 may have msys performance issues, so I am not entirely sure what to change first. Or maybe avoiding it all and cross compiling is the best answer. Dear Andy, yes, the performance during compiling with msys on windows is indeed horrible. Yes, this used to take hours literally, so I assume it isn't too unusual what you see here. Cross-compiling for windows on a linux host (mingw cross compiler) is surprisingly much much faster. However, not all of the dependencies can be cross-compiled, if I recall correctly. I don't think it's a kvm vs. virtualbox issue. Nevertheless the performance of msys might indeed be even worse on windows 7, compared to Windows XP or similar. I don't know any details here, though. FYI, the build server (using vmware) takes about 5 hours to build a tag build (which includes building all the dependencies). A normal rebuild takes about 1 hours, where it re-uses the dependencies built the night before. Regards, Christian -derek -- Derek Atkins, SB '93 MIT EE, SM '95 MIT Media Laboratory Member, MIT Student Information Processing Board (SIPB) URL: http://web.mit.edu/warlord/PP-ASEL-IA N1NWH warl...@mit.eduPGP key available ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
On Jan 28, 2012 4:30 PM, Christian Stimming christ...@cstimming.de wrote: Am Freitag, 27. Januar 2012, 19:04:10 schrieb Andy Clayton: Is the switch to git stuck on 1) the sed crash on windows after adding git and then 2) porting the build scripts? Yes, both. The porting of the build scripts is a task that I thought I could look into, but don't have had time for it so far. The sed crash indicates a conflict of msys-git's msys environment with the build server's main msys environment. Maybe we can live with that by calling git by its absolute path so that its msys DLLs are not in PATH, but I haven't checked this further. Regards, Christian Thanks for the update. I tried getting gnucash to build on windows 7 in a virtualbox VM so I could look into this and other issues, but performace was horrible. Configuring and compiling a single dependency took hours. Apparently this is somewhat expected even without the VM because fork isn't cheap on windows, but I am wondering what others have found. Are things any better with the official vmware builder? Or has anyone tried and had better luck with KVM instead of virtualbox? I have also read that Windows 7 may have msys performance issues, so I am not entirely sure what to change first. Or maybe avoiding it all and cross compiling is the best answer. Andy ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
Am Dienstag, 21. Februar 2012, 12:20:06 schrieb Andy Clayton: Thanks for the update. I tried getting gnucash to build on windows 7 in a virtualbox VM so I could look into this and other issues, but performace was horrible. Configuring and compiling a single dependency took hours. Apparently this is somewhat expected even without the VM because fork isn't cheap on windows, but I am wondering what others have found. Are things any better with the official vmware builder? Or has anyone tried and had better luck with KVM instead of virtualbox? I have also read that Windows 7 may have msys performance issues, so I am not entirely sure what to change first. Or maybe avoiding it all and cross compiling is the best answer. Dear Andy, yes, the performance during compiling with msys on windows is indeed horrible. Yes, this used to take hours literally, so I assume it isn't too unusual what you see here. Cross-compiling for windows on a linux host (mingw cross compiler) is surprisingly much much faster. However, not all of the dependencies can be cross-compiled, if I recall correctly. I don't think it's a kvm vs. virtualbox issue. Nevertheless the performance of msys might indeed be even worse on windows 7, compared to Windows XP or similar. I don't know any details here, though. Regards, Christian ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
John Ralls jra...@ceridwen.us writes: No, that won't work, because it will still need $PATH to find its dlls. Not if all the dependent DLLs are in the same directory as the .exe -derek -- Derek Atkins, SB '93 MIT EE, SM '95 MIT Media Laboratory Member, MIT Student Information Processing Board (SIPB) URL: http://web.mit.edu/warlord/PP-ASEL-IA N1NWH warl...@mit.eduPGP key available ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
On Jan 30, 2012, at 9:19 AM, Derek Atkins wrote: John Ralls jra...@ceridwen.us writes: No, that won't work, because it will still need $PATH to find its dlls. Not if all the dependent DLLs are in the same directory as the .exe Perhaps I said that wrong. It won't work if it can find the wrong DLLs on the path. See https://bugzilla.gnome.org/show_bug.cgi?id=668403, where having Lilypad's libguile17.dll on the path screwed up loading GC. Regards, John Ralls ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
Am Freitag, 27. Januar 2012, 19:04:10 schrieb Andy Clayton: If I have some time during the next days, I'll look into porting the SVN- dependencies in our build scripts to using git. Also, I don't think it's necessary to distinguish tags that should trigger a build from those which don't - we can just as well have *each* tag trigger a rebuild on its own. The build server just needs a list of tag and SHA1. Is the switch to git stuck on 1) the sed crash on windows after adding git and then 2) porting the build scripts? Yes, both. The porting of the build scripts is a task that I thought I could look into, but don't have had time for it so far. The sed crash indicates a conflict of msys-git's msys environment with the build server's main msys environment. Maybe we can live with that by calling git by its absolute path so that its msys DLLs are not in PATH, but I haven't checked this further. Regards, Christian ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
On Jan 28, 2012, at 2:30 PM, Christian Stimming wrote: Am Freitag, 27. Januar 2012, 19:04:10 schrieb Andy Clayton: If I have some time during the next days, I'll look into porting the SVN- dependencies in our build scripts to using git. Also, I don't think it's necessary to distinguish tags that should trigger a build from those which don't - we can just as well have *each* tag trigger a rebuild on its own. The build server just needs a list of tag and SHA1. Is the switch to git stuck on 1) the sed crash on windows after adding git and then 2) porting the build scripts? Yes, both. The porting of the build scripts is a task that I thought I could look into, but don't have had time for it so far. The sed crash indicates a conflict of msys-git's msys environment with the build server's main msys environment. Maybe we can live with that by calling git by its absolute path so that its msys DLLs are not in PATH, but I haven't checked this further. No, that won't work, because it will still need $PATH to find its dlls. Jhbuild-windows (http://afuera.me.uk/jhbuild-windows/, don't use the GnomeLive! page, it doesn't work) where he uses a one-line .cmd file to run git from inside Msys: @c:\\tools\\git\\bin\\sh.exe -c /c/tools/git/bin/git %* Regards, John Ralls ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
On 12/29/2011 03:50 PM, John Ralls wrote: On Dec 29, 2011, at 11:46 AM, Christian Stimming wrote: I've been using git on windows for years in my daily work by now. The one from http://code.google.com/p/msysgit/downloads/list?can=3 is indeed the official one if you want a git (cmdline) executable on windows. I think it's pointless to try to build a smaller git package yourself. Just use the git.exe that comes with that package and that's it. In my work computer, I have a msys installation that I use for my normal work, but the git.exe comes from that very package which additionally has its own msys installation. Apart from the large download volume I didn't notice any problems in this setup. If I have some time during the next days, I'll look into porting the SVN- dependencies in our build scripts to using git. Also, I don't think it's necessary to distinguish tags that should trigger a build from those which don't - we can just as well have *each* tag trigger a rebuild on its own. The build server just needs a list of tag and SHA1. Is the switch to git stuck on 1) the sed crash on windows after adding git and then 2) porting the build scripts? Andy ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
On Dec 29, 2011, at 7:45 AM, Geert Janssens wrote: Op woensdag 28 december 2011 17:08:13 schreef John Ralls: Heh, don't underestimate the configuration of our Windows build server. It checks every night if it has to (re)build some tagged versions. It does this by making a list of all tags (and their associated revision) and comparing this with yesterday's list. If there is any tag/revision combination that doesn't exist yet, it will rebuild this tag. So if the revision numbers in git don't match those in our own svn tree, that means that the server will attempt to rebuild every tag that is present in the tags directory (well to be precise each tag of the format x.y.z). That will cause a lot of (useless) rebuilds for one night.So before we switch the tag builds to use git, we better 1. be very sure the git created revision numbers never change 2. manually recreate the tag history file based on git's revision information. But other than that I don't consider this a big issue. Assuming the svn access github provides will be stable, and is meant to replace our own internally managed svn tree, the numbering mismatch is only a temporary inconvenience. ISTM it would be better to have the release script look at the SHA reference in the tag using git rather than to depend upon Github's subversion gateway. I'm not opposed to this idea as such, but the whole discussion so far was focussed on the idea of reusing the svn based automated build scripts, to avoid the need to change everything in one go. I've been giving my feedback with that idea in mind. Last time I checked (a few minutes ago), git support on Windows was still in beta, at least the project I found: http://code.google.com/p/msysgit/ Perhaps there's another one ? On the one hand, I wouldn't worry about that too much: It looks like it's always been beta. What's more, the beta-ness likely has more to do with the GUI, and we're not really interested in that, just in some of the basic git commands. On the other hand, it installs a complete MinGW/MSys for its private use, so I'm looking into building git from source in our existing environment. Regards, John Ralls ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
Op woensdag 28 december 2011 17:08:13 schreef John Ralls: Heh, don't underestimate the configuration of our Windows build server. It checks every night if it has to (re)build some tagged versions. It does this by making a list of all tags (and their associated revision) and comparing this with yesterday's list. If there is any tag/revision combination that doesn't exist yet, it will rebuild this tag. So if the revision numbers in git don't match those in our own svn tree, that means that the server will attempt to rebuild every tag that is present in the tags directory (well to be precise each tag of the format x.y.z). That will cause a lot of (useless) rebuilds for one night.So before we switch the tag builds to use git, we better 1. be very sure the git created revision numbers never change 2. manually recreate the tag history file based on git's revision information. But other than that I don't consider this a big issue. Assuming the svn access github provides will be stable, and is meant to replace our own internally managed svn tree, the numbering mismatch is only a temporary inconvenience. ISTM it would be better to have the release script look at the SHA reference in the tag using git rather than to depend upon Github's subversion gateway. I'm not opposed to this idea as such, but the whole discussion so far was focussed on the idea of reusing the svn based automated build scripts, to avoid the need to change everything in one go. I've been giving my feedback with that idea in mind. Last time I checked (a few minutes ago), git support on Windows was still in beta, at least the project I found: http://code.google.com/p/msysgit/ Perhaps there's another one ? We probably want a bit more sophistication in the check than just a tag; with git people make tags (and delete) tags for all sorts of things besides releases... so maybe a keyword (RELEASE?) in the log summary, or a particular format for the tag (GnuCash-Release-2.5.1?). That would also save us the trouble of backfilling the history file (not that that's hard) since none of the existing tags are likely to meet the new criteria. Agreed here. Geert ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
Am Donnerstag, 29. Dezember 2011, 09:47:35 schrieb John Ralls: ISTM it would be better to have the release script look at the SHA reference in the tag using git rather than to depend upon Github's subversion gateway. Absolutely. After thinking about this for a bit, I think retrieving the various branches via git and checking for existence of new tags is clearly much more easy using git, compared to using svn. However, it means we must re- write those parts of the build scripts. Last time I checked (a few minutes ago), git support on Windows was still in beta, at least the project I found: http://code.google.com/p/msysgit/ Perhaps there's another one ? On the one hand, I wouldn't worry about that too much: It looks like it's always been beta. What's more, the beta-ness likely has more to do with the GUI, and we're not really interested in that, just in some of the basic git commands. On the other hand, it installs a complete MinGW/MSys for its private use, so I'm looking into building git from source in our existing environment. I've been using git on windows for years in my daily work by now. The one from http://code.google.com/p/msysgit/downloads/list?can=3 is indeed the official one if you want a git (cmdline) executable on windows. I think it's pointless to try to build a smaller git package yourself. Just use the git.exe that comes with that package and that's it. In my work computer, I have a msys installation that I use for my normal work, but the git.exe comes from that very package which additionally has its own msys installation. Apart from the large download volume I didn't notice any problems in this setup. If I have some time during the next days, I'll look into porting the SVN- dependencies in our build scripts to using git. Also, I don't think it's necessary to distinguish tags that should trigger a build from those which don't - we can just as well have *each* tag trigger a rebuild on its own. The build server just needs a list of tag and SHA1. Regards, Christian ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
On Dec 29, 2011, at 11:46 AM, Christian Stimming wrote: Am Donnerstag, 29. Dezember 2011, 09:47:35 schrieb John Ralls: ISTM it would be better to have the release script look at the SHA reference in the tag using git rather than to depend upon Github's subversion gateway. Absolutely. After thinking about this for a bit, I think retrieving the various branches via git and checking for existence of new tags is clearly much more easy using git, compared to using svn. However, it means we must re- write those parts of the build scripts. Last time I checked (a few minutes ago), git support on Windows was still in beta, at least the project I found: http://code.google.com/p/msysgit/ Perhaps there's another one ? On the one hand, I wouldn't worry about that too much: It looks like it's always been beta. What's more, the beta-ness likely has more to do with the GUI, and we're not really interested in that, just in some of the basic git commands. On the other hand, it installs a complete MinGW/MSys for its private use, so I'm looking into building git from source in our existing environment. I've been using git on windows for years in my daily work by now. The one from http://code.google.com/p/msysgit/downloads/list?can=3 is indeed the official one if you want a git (cmdline) executable on windows. I think it's pointless to try to build a smaller git package yourself. Just use the git.exe that comes with that package and that's it. In my work computer, I have a msys installation that I use for my normal work, but the git.exe comes from that very package which additionally has its own msys installation. Apart from the large download volume I didn't notice any problems in this setup. If I have some time during the next days, I'll look into porting the SVN- dependencies in our build scripts to using git. Also, I don't think it's necessary to distinguish tags that should trigger a build from those which don't - we can just as well have *each* tag trigger a rebuild on its own. The build server just needs a list of tag and SHA1. Good to know. It doesn't look like I'd be able to get git built in our environment without some surgery on it... compat/regex won't build. Regards, John Ralls ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
Op zondag 25 december 2011 10:26:34 schreef John Ralls: On Dec 25, 2011, at 9:13 AM, John Ralls wrote: On Nov 28, 2011, at 3:07 PM, John Ralls wrote: On Nov 28, 2011, at 9:37 AM, Geert Janssens wrote: On maandag 28 november 2011, John Ralls wrote: On Nov 27, 2011, at 2:32 PM, Geert Janssens wrote: On woensdag 23 november 2011, John Ralls wrote: On Nov 11, 2011, at 10:22 AM, Geert Janssens wrote: On vrijdag 11 november 2011, Yawar Amin wrote: Hi Geert, On 2011-11-11, at 11:47, Geert Janssens wrote: […] Is there a way to create a branch via the github interface ? Or do I have to create one on my local repo and push it ? I didn't seem to find a feature on the website, but perhaps I missed it. I'm not very comfortable yet with te remote repo handling in git, so I prefer to ask before messing things up. You can do the latter. # In your local repo git branch master remotes/origin/trunk git push origin master Ok, I created a master branch, but svn checkout still fails with the same error. I guess we'll have to wait for github's response to John's comment on the blog. Well, there was never an answer to the blog post. But I tried it just now and it checks out OK. Someone else has complained about an authentication problem trying to commit, but we can't test that, it would break the mirror with gnucash.org. I have been trying this for a couple of days now, but I still can't checkout. What command did you use ? svn checkout https://svn.github.com/Gnucash/gnucash Tried it just now and it worked. Indeed, that incantation does work. It seems to check out the current trunk branch. I can't figure out how to check out the 2.4 branch though, or the 2.4.x tag. Did you have more luck ? I have to admit that I didn't try... so I looked at the blog post again and I see that that was the old URL that they're supposed to be taking down. The correct URL doesn't work. The right one fails. I had a thought that it might be the presence of a trunk branch, so I changed trunk to master in my own Github repo (github.com/Gnucash/gnucash). No joy. I've sent a support request. Which they finally got around to handling (Tuesday, but I didn't test it until today). It works. Yay! There's a catch, though: The numbers don't match up. To begin with, the first number is 89: r89 | unknown | 1997-10-31 09:39:32 -0800 (Fri, 31 Oct 1997) | 3 lines New repository initialized by cvs2svn. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/gnucash/trunk@3 57a11ea4-9604-0410-9ed3-97b8803252fd Notice that it's r3 in our svn numbering. The numbers diverge even more later, because we have a single repo with multiple datasets (gnucash, gnucash-htdocs, gnucash-docs, and gnucash-meta), but those are separate repos in git -- and gnucash-meta isn't exported to git yet. So every revision in one of the other datasets creates a discrepancy. The HEAD of the 2.4 branch is r17583 | john.ralls | 2011-12-24 08:58:55 -0800 (Sat, 24 Dec 2011) | 3 lines Add gdk_pixbuf to the distribution git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/branches/2.4@21777 57a11ea4-9604-0410-9ed3-97b8803252fd and of Trunk: r17581 | geert.janssens | 2011-12-23 21:27:56 -0800 (Fri, 23 Dec 2011) | 4 lines Win32 build: abort build process if install.sh step failed. BP git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@21775 57a11ea4-9604-0410-9ed3-97b8803252fd The only time this is likely to be a problem is if someone does a build from an SVN checkout: It will look like they've used a really old version. Heh, don't underestimate the configuration of our Windows build server. It checks every night if it has to (re)build some tagged versions. It does this by making a list of all tags (and their associated revision) and comparing this with yesterday's list. If there is any tag/revision combination that doesn't exist yet, it will rebuild this tag. So if the revision numbers in git don't match those in our own svn tree, that means that the server will attempt to rebuild every tag that is present in the tags directory (well to be precise each tag of the format x.y.z). That will cause a lot of (useless) rebuilds for one night.So before we switch the tag builds to use git, we better 1. be very sure the git created revision numbers never change 2. manually recreate the tag history file based on git's revision information. But other than that I don't consider this a big issue. Assuming the svn access github provides will be stable, and is meant to replace our own internally managed svn tree, the numbering mismatch is only a temporary inconvenience. Geert
Re: Git Migration: github with svn access
On Dec 28, 2011, at 6:45 AM, Geert Janssens wrote: Op zondag 25 december 2011 10:26:34 schreef John Ralls: On Dec 25, 2011, at 9:13 AM, John Ralls wrote: On Nov 28, 2011, at 3:07 PM, John Ralls wrote: On Nov 28, 2011, at 9:37 AM, Geert Janssens wrote: On maandag 28 november 2011, John Ralls wrote: On Nov 27, 2011, at 2:32 PM, Geert Janssens wrote: On woensdag 23 november 2011, John Ralls wrote: On Nov 11, 2011, at 10:22 AM, Geert Janssens wrote: On vrijdag 11 november 2011, Yawar Amin wrote: Hi Geert, On 2011-11-11, at 11:47, Geert Janssens wrote: […] Is there a way to create a branch via the github interface ? Or do I have to create one on my local repo and push it ? I didn't seem to find a feature on the website, but perhaps I missed it. I'm not very comfortable yet with te remote repo handling in git, so I prefer to ask before messing things up. You can do the latter. # In your local repo git branch master remotes/origin/trunk git push origin master Ok, I created a master branch, but svn checkout still fails with the same error. I guess we'll have to wait for github's response to John's comment on the blog. Well, there was never an answer to the blog post. But I tried it just now and it checks out OK. Someone else has complained about an authentication problem trying to commit, but we can't test that, it would break the mirror with gnucash.org. I have been trying this for a couple of days now, but I still can't checkout. What command did you use ? svn checkout https://svn.github.com/Gnucash/gnucash Tried it just now and it worked. Indeed, that incantation does work. It seems to check out the current trunk branch. I can't figure out how to check out the 2.4 branch though, or the 2.4.x tag. Did you have more luck ? I have to admit that I didn't try... so I looked at the blog post again and I see that that was the old URL that they're supposed to be taking down. The correct URL doesn't work. The right one fails. I had a thought that it might be the presence of a trunk branch, so I changed trunk to master in my own Github repo (github.com/Gnucash/gnucash). No joy. I've sent a support request. Which they finally got around to handling (Tuesday, but I didn't test it until today). It works. Yay! There's a catch, though: The numbers don't match up. To begin with, the first number is 89: r89 | unknown | 1997-10-31 09:39:32 -0800 (Fri, 31 Oct 1997) | 3 lines New repository initialized by cvs2svn. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/gnucash/trunk@3 57a11ea4-9604-0410-9ed3-97b8803252fd Notice that it's r3 in our svn numbering. The numbers diverge even more later, because we have a single repo with multiple datasets (gnucash, gnucash-htdocs, gnucash-docs, and gnucash-meta), but those are separate repos in git -- and gnucash-meta isn't exported to git yet. So every revision in one of the other datasets creates a discrepancy. The HEAD of the 2.4 branch is r17583 | john.ralls | 2011-12-24 08:58:55 -0800 (Sat, 24 Dec 2011) | 3 lines Add gdk_pixbuf to the distribution git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/branches/2.4@21777 57a11ea4-9604-0410-9ed3-97b8803252fd and of Trunk: r17581 | geert.janssens | 2011-12-23 21:27:56 -0800 (Fri, 23 Dec 2011) | 4 lines Win32 build: abort build process if install.sh step failed. BP git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@21775 57a11ea4-9604-0410-9ed3-97b8803252fd The only time this is likely to be a problem is if someone does a build from an SVN checkout: It will look like they've used a really old version. Heh, don't underestimate the configuration of our Windows build server. It checks every night if it has to (re)build some tagged versions. It does this by making a list of all tags (and their associated revision) and comparing this with yesterday's list. If there is any tag/revision combination that doesn't exist yet, it will rebuild this tag. So if the revision numbers in git don't match those in our own svn tree, that means that the server will attempt to rebuild every tag that is present in the tags directory (well to be precise each tag of the format x.y.z). That will cause a lot of (useless) rebuilds for one night.So before we switch the tag builds to use git, we better 1. be very sure the git created revision numbers never change 2. manually recreate the tag history file based on git's revision information. But other than that I don't consider this a big issue. Assuming the svn access github provides will be stable, and is meant to replace our own internally managed svn tree, the numbering mismatch is only a temporary inconvenience. ISTM it would be
Re: Git Migration: github with svn access
On Nov 28, 2011, at 3:07 PM, John Ralls wrote: On Nov 28, 2011, at 9:37 AM, Geert Janssens wrote: On maandag 28 november 2011, John Ralls wrote: On Nov 27, 2011, at 2:32 PM, Geert Janssens wrote: On woensdag 23 november 2011, John Ralls wrote: On Nov 11, 2011, at 10:22 AM, Geert Janssens wrote: On vrijdag 11 november 2011, Yawar Amin wrote: Hi Geert, On 2011-11-11, at 11:47, Geert Janssens wrote: […] Is there a way to create a branch via the github interface ? Or do I have to create one on my local repo and push it ? I didn't seem to find a feature on the website, but perhaps I missed it. I'm not very comfortable yet with te remote repo handling in git, so I prefer to ask before messing things up. You can do the latter. # In your local repo git branch master remotes/origin/trunk git push origin master Ok, I created a master branch, but svn checkout still fails with the same error. I guess we'll have to wait for github's response to John's comment on the blog. Well, there was never an answer to the blog post. But I tried it just now and it checks out OK. Someone else has complained about an authentication problem trying to commit, but we can't test that, it would break the mirror with gnucash.org. I have been trying this for a couple of days now, but I still can't checkout. What command did you use ? svn checkout https://svn.github.com/Gnucash/gnucash Tried it just now and it worked. Indeed, that incantation does work. It seems to check out the current trunk branch. I can't figure out how to check out the 2.4 branch though, or the 2.4.x tag. Did you have more luck ? I have to admit that I didn't try... so I looked at the blog post again and I see that that was the old URL that they're supposed to be taking down. The correct URL doesn't work. The right one fails. I had a thought that it might be the presence of a trunk branch, so I changed trunk to master in my own Github repo (github.com/Gnucash/gnucash). No joy. I've sent a support request. Which they finally got around to handling (Tuesday, but I didn't test it until today). It works. Yay! So what's next? Setting up the hooks? Regards, John Ralls ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
On Dec 25, 2011, at 9:13 AM, John Ralls wrote: On Nov 28, 2011, at 3:07 PM, John Ralls wrote: On Nov 28, 2011, at 9:37 AM, Geert Janssens wrote: On maandag 28 november 2011, John Ralls wrote: On Nov 27, 2011, at 2:32 PM, Geert Janssens wrote: On woensdag 23 november 2011, John Ralls wrote: On Nov 11, 2011, at 10:22 AM, Geert Janssens wrote: On vrijdag 11 november 2011, Yawar Amin wrote: Hi Geert, On 2011-11-11, at 11:47, Geert Janssens wrote: […] Is there a way to create a branch via the github interface ? Or do I have to create one on my local repo and push it ? I didn't seem to find a feature on the website, but perhaps I missed it. I'm not very comfortable yet with te remote repo handling in git, so I prefer to ask before messing things up. You can do the latter. # In your local repo git branch master remotes/origin/trunk git push origin master Ok, I created a master branch, but svn checkout still fails with the same error. I guess we'll have to wait for github's response to John's comment on the blog. Well, there was never an answer to the blog post. But I tried it just now and it checks out OK. Someone else has complained about an authentication problem trying to commit, but we can't test that, it would break the mirror with gnucash.org. I have been trying this for a couple of days now, but I still can't checkout. What command did you use ? svn checkout https://svn.github.com/Gnucash/gnucash Tried it just now and it worked. Indeed, that incantation does work. It seems to check out the current trunk branch. I can't figure out how to check out the 2.4 branch though, or the 2.4.x tag. Did you have more luck ? I have to admit that I didn't try... so I looked at the blog post again and I see that that was the old URL that they're supposed to be taking down. The correct URL doesn't work. The right one fails. I had a thought that it might be the presence of a trunk branch, so I changed trunk to master in my own Github repo (github.com/Gnucash/gnucash). No joy. I've sent a support request. Which they finally got around to handling (Tuesday, but I didn't test it until today). It works. Yay! There's a catch, though: The numbers don't match up. To begin with, the first number is 89: r89 | unknown | 1997-10-31 09:39:32 -0800 (Fri, 31 Oct 1997) | 3 lines New repository initialized by cvs2svn. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/gnucash/trunk@3 57a11ea4-9604-0410-9ed3-97b8803252fd Notice that it's r3 in our svn numbering. The numbers diverge even more later, because we have a single repo with multiple datasets (gnucash, gnucash-htdocs, gnucash-docs, and gnucash-meta), but those are separate repos in git -- and gnucash-meta isn't exported to git yet. So every revision in one of the other datasets creates a discrepancy. The HEAD of the 2.4 branch is r17583 | john.ralls | 2011-12-24 08:58:55 -0800 (Sat, 24 Dec 2011) | 3 lines Add gdk_pixbuf to the distribution git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/branches/2.4@21777 57a11ea4-9604-0410-9ed3-97b8803252fd and of Trunk: r17581 | geert.janssens | 2011-12-23 21:27:56 -0800 (Fri, 23 Dec 2011) | 4 lines Win32 build: abort build process if install.sh step failed. BP git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@21775 57a11ea4-9604-0410-9ed3-97b8803252fd The only time this is likely to be a problem is if someone does a build from an SVN checkout: It will look like they've used a really old version. Regards (and Merry Christmas), John Ralls ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
On maandag 28 november 2011, John Ralls wrote: On Nov 27, 2011, at 2:32 PM, Geert Janssens wrote: On woensdag 23 november 2011, John Ralls wrote: On Nov 11, 2011, at 10:22 AM, Geert Janssens wrote: On vrijdag 11 november 2011, Yawar Amin wrote: Hi Geert, On 2011-11-11, at 11:47, Geert Janssens wrote: […] Is there a way to create a branch via the github interface ? Or do I have to create one on my local repo and push it ? I didn't seem to find a feature on the website, but perhaps I missed it. I'm not very comfortable yet with te remote repo handling in git, so I prefer to ask before messing things up. You can do the latter. # In your local repo git branch master remotes/origin/trunk git push origin master Ok, I created a master branch, but svn checkout still fails with the same error. I guess we'll have to wait for github's response to John's comment on the blog. Well, there was never an answer to the blog post. But I tried it just now and it checks out OK. Someone else has complained about an authentication problem trying to commit, but we can't test that, it would break the mirror with gnucash.org. I have been trying this for a couple of days now, but I still can't checkout. What command did you use ? svn checkout https://svn.github.com/Gnucash/gnucash Tried it just now and it worked. Indeed, that incantation does work. It seems to check out the current trunk branch. I can't figure out how to check out the 2.4 branch though, or the 2.4.x tag. Did you have more luck ? Geert ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
On Nov 28, 2011, at 9:37 AM, Geert Janssens wrote: On maandag 28 november 2011, John Ralls wrote: On Nov 27, 2011, at 2:32 PM, Geert Janssens wrote: On woensdag 23 november 2011, John Ralls wrote: On Nov 11, 2011, at 10:22 AM, Geert Janssens wrote: On vrijdag 11 november 2011, Yawar Amin wrote: Hi Geert, On 2011-11-11, at 11:47, Geert Janssens wrote: […] Is there a way to create a branch via the github interface ? Or do I have to create one on my local repo and push it ? I didn't seem to find a feature on the website, but perhaps I missed it. I'm not very comfortable yet with te remote repo handling in git, so I prefer to ask before messing things up. You can do the latter. # In your local repo git branch master remotes/origin/trunk git push origin master Ok, I created a master branch, but svn checkout still fails with the same error. I guess we'll have to wait for github's response to John's comment on the blog. Well, there was never an answer to the blog post. But I tried it just now and it checks out OK. Someone else has complained about an authentication problem trying to commit, but we can't test that, it would break the mirror with gnucash.org. I have been trying this for a couple of days now, but I still can't checkout. What command did you use ? svn checkout https://svn.github.com/Gnucash/gnucash Tried it just now and it worked. Indeed, that incantation does work. It seems to check out the current trunk branch. I can't figure out how to check out the 2.4 branch though, or the 2.4.x tag. Did you have more luck ? I have to admit that I didn't try... so I looked at the blog post again and I see that that was the old URL that they're supposed to be taking down. The correct URL doesn't work. The right one fails. I had a thought that it might be the presence of a trunk branch, so I changed trunk to master in my own Github repo (github.com/Gnucash/gnucash). No joy. I've sent a support request. Regards, John Ralls ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
On woensdag 23 november 2011, John Ralls wrote: On Nov 11, 2011, at 10:22 AM, Geert Janssens wrote: On vrijdag 11 november 2011, Yawar Amin wrote: Hi Geert, On 2011-11-11, at 11:47, Geert Janssens wrote: […] Is there a way to create a branch via the github interface ? Or do I have to create one on my local repo and push it ? I didn't seem to find a feature on the website, but perhaps I missed it. I'm not very comfortable yet with te remote repo handling in git, so I prefer to ask before messing things up. You can do the latter. # In your local repo git branch master remotes/origin/trunk git push origin master Ok, I created a master branch, but svn checkout still fails with the same error. I guess we'll have to wait for github's response to John's comment on the blog. Well, there was never an answer to the blog post. But I tried it just now and it checks out OK. Someone else has complained about an authentication problem trying to commit, but we can't test that, it would break the mirror with gnucash.org. I have been trying this for a couple of days now, but I still can't checkout. What command did you use ? Geert ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
On Nov 27, 2011, at 2:32 PM, Geert Janssens wrote: On woensdag 23 november 2011, John Ralls wrote: On Nov 11, 2011, at 10:22 AM, Geert Janssens wrote: On vrijdag 11 november 2011, Yawar Amin wrote: Hi Geert, On 2011-11-11, at 11:47, Geert Janssens wrote: […] Is there a way to create a branch via the github interface ? Or do I have to create one on my local repo and push it ? I didn't seem to find a feature on the website, but perhaps I missed it. I'm not very comfortable yet with te remote repo handling in git, so I prefer to ask before messing things up. You can do the latter. # In your local repo git branch master remotes/origin/trunk git push origin master Ok, I created a master branch, but svn checkout still fails with the same error. I guess we'll have to wait for github's response to John's comment on the blog. Well, there was never an answer to the blog post. But I tried it just now and it checks out OK. Someone else has complained about an authentication problem trying to commit, but we can't test that, it would break the mirror with gnucash.org. I have been trying this for a couple of days now, but I still can't checkout. What command did you use ? svn checkout https://svn.github.com/Gnucash/gnucash Tried it just now and it worked. Regards, John Ralls ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
On zaterdag 12 november 2011, Yawar Amin wrote: Hi Geert, run: git push origin :master This pushes an empty branch name (the part before the colon) from your local repo to the master branch of the origin repo, effectively deleting it. Wow, not exactly the most intuitive command choice by our great Linus. Mathematically it does make sense of course... ;) Thanks for clarifying this. I did remove the master branch for now. Geert ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
On woensdag 9 november 2011, Yawar Amin wrote: Hi, On Wed, Nov 9, 2011 at 2:30 PM, Christian Stimming christ...@cstimming.dewrote: [...] Same for me - I was able to svn checkout one of my other normal git repos, but with gnucash I, too, got 502 Bad Gateway. However, it came up with a trunk and branches directory, so that I had to append trunk to the URL to get a useful source tree. For gnucash, this didn't change the problem, though. I think this is the issue I mentioned yesterday--you need a `master' branch in the Git repo to do a Subversion checkout. Regards, Yawar I'm tempted to try this out by manually adding a master branch in the main git repository on github, but I don't know if this would confuse the svn-git syncrhonisation we have currently. Anyone know this ? Geert ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
On Nov 11, 2011, at 6:16 AM, Geert Janssens wrote: On woensdag 9 november 2011, Yawar Amin wrote: Hi, On Wed, Nov 9, 2011 at 2:30 PM, Christian Stimming christ...@cstimming.dewrote: [...] Same for me - I was able to svn checkout one of my other normal git repos, but with gnucash I, too, got 502 Bad Gateway. However, it came up with a trunk and branches directory, so that I had to append trunk to the URL to get a useful source tree. For gnucash, this didn't change the problem, though. I think this is the issue I mentioned yesterday--you need a `master' branch in the Git repo to do a Subversion checkout. Regards, Yawar I'm tempted to try this out by manually adding a master branch in the main git repository on github, but I don't know if this would confuse the svn-git syncrhonisation we have currently. Anyone know this ? It won't confuse it, but it won't get updated, either. I think for experimentation you could add the branch, see if you can do a subversion checkout, then delete the branch. Regards, John Ralls ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
On vrijdag 11 november 2011, John Ralls wrote: On Nov 11, 2011, at 6:16 AM, Geert Janssens wrote: On woensdag 9 november 2011, Yawar Amin wrote: Hi, On Wed, Nov 9, 2011 at 2:30 PM, Christian Stimming christ...@cstimming.dewrote: [...] Same for me - I was able to svn checkout one of my other normal git repos, but with gnucash I, too, got 502 Bad Gateway. However, it came up with a trunk and branches directory, so that I had to append trunk to the URL to get a useful source tree. For gnucash, this didn't change the problem, though. I think this is the issue I mentioned yesterday--you need a `master' branch in the Git repo to do a Subversion checkout. Regards, Yawar I'm tempted to try this out by manually adding a master branch in the main git repository on github, but I don't know if this would confuse the svn-git syncrhonisation we have currently. Anyone know this ? It won't confuse it, but it won't get updated, either. I was aware of that indeed. I think for experimentation you could add the branch, see if you can do a subversion checkout, then delete the branch. Is there a way to create a branch via the github interface ? Or do I have to create one on my local repo and push it ? I didn't seem to find a feature on the website, but perhaps I missed it. I'm not very comfortable yet with te remote repo handling in git, so I prefer to ask before messing things up. Geert ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
Hi Geert, On 2011-11-11, at 11:47, Geert Janssens wrote: […] Is there a way to create a branch via the github interface ? Or do I have to create one on my local repo and push it ? I didn't seem to find a feature on the website, but perhaps I missed it. I'm not very comfortable yet with te remote repo handling in git, so I prefer to ask before messing things up. You can do the latter. # In your local repo git branch master remotes/origin/trunk git push origin master Regards, Yawar PGP.sig Description: This is a digitally signed message part ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
On vrijdag 11 november 2011, Yawar Amin wrote: Hi Geert, On 2011-11-11, at 11:47, Geert Janssens wrote: […] Is there a way to create a branch via the github interface ? Or do I have to create one on my local repo and push it ? I didn't seem to find a feature on the website, but perhaps I missed it. I'm not very comfortable yet with te remote repo handling in git, so I prefer to ask before messing things up. You can do the latter. # In your local repo git branch master remotes/origin/trunk git push origin master Ok, I created a master branch, but svn checkout still fails with the same error. I guess we'll have to wait for github's response to John's comment on the blog. By the way how do I remove the branch again ? I have been seaching for a way to do that before, but didn't find it. Geert ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
Hi Geert, run: git push origin :master This pushes an empty branch name (the part before the colon) from your local repo to the master branch of the origin repo, effectively deleting it. Regards, Yawar Geert Janssens janssens-ge...@telenet.be wrote: On vrijdag 11 november 2011, Yawar Amin wrote: Hi Geert, On 2011-11-11, at 11:47, Geert Janssens wrote: […] Is there a way to create a branch via the github interface ? Or do I have to create one on my local repo and push it ? I didn't seem to find a feature on the website, but perhaps I missed it. I'm not very comfortable yet with te remote repo handling in git, so I prefer to ask before messing things up. You can do the latter. # In your local repo git branch master remotes/origin/trunk git push origin master Ok, I created a master branch, but svn checkout still fails with the same error. I guess we'll have to wait for github's response to John's comment on the blog. By the way how do I remove the branch again ? I have been seaching for a way to do that before, but didn't find it. Geert ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
On maandag 7 november 2011, Geert Janssens wrote: On maandag 7 november 2011, Christian Stimming wrote: If we decided to move not only to git, but also to github, we'd solve most of the build script integration issues: github offers the additional feature of accessing its git repos also by a svn client, see https://github.com/blog/966-improved-subversion-client-support Very interesting. I wasn't aware of this. I tried a simple svn checkout of our gnucash git repo, but wasn't successful: $ svn checkout https://github.com/Gnucash/gnucash.git gnucash-git-svn svn: Server sent unexpected return value (502 Bad Gateway) in response to OPTIONS request for 'https://github.com/Gnucash/gnucash.git' I have no idea why though. Has anyone else managed to successfully checkout the git repo via the svn interface ? Geert ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
On Nov 9, 2011, at 8:00 AM, Geert Janssens wrote: On maandag 7 november 2011, Geert Janssens wrote: On maandag 7 november 2011, Christian Stimming wrote: If we decided to move not only to git, but also to github, we'd solve most of the build script integration issues: github offers the additional feature of accessing its git repos also by a svn client, see https://github.com/blog/966-improved-subversion-client-support Very interesting. I wasn't aware of this. I tried a simple svn checkout of our gnucash git repo, but wasn't successful: $ svn checkout https://github.com/Gnucash/gnucash.git gnucash-git-svn svn: Server sent unexpected return value (502 Bad Gateway) in response to OPTIONS request for 'https://github.com/Gnucash/gnucash.git' I have no idea why though. Has anyone else managed to successfully checkout the git repo via the svn interface ? Hmmph. I was able to access one of my normal repos, but get the same result as you with Gnucash. I added a comment about that to the blog page above. We'll see. It's entirely possible that there's some git-svn cruft in the repo that's choking their svn conversion tool. Regards, John Ralls ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
Am Mittwoch, 9. November 2011 schrieb John Ralls: On Nov 9, 2011, at 8:00 AM, Geert Janssens wrote: On maandag 7 november 2011, Geert Janssens wrote: On maandag 7 november 2011, Christian Stimming wrote: If we decided to move not only to git, but also to github, we'd solve most of the build script integration issues: github offers the additional feature of accessing its git repos also by a svn client, see https://github.com/blog/966-improved-subversion-client-support Very interesting. I wasn't aware of this. I tried a simple svn checkout of our gnucash git repo, but wasn't successful: $ svn checkout https://github.com/Gnucash/gnucash.git gnucash-git-svn svn: Server sent unexpected return value (502 Bad Gateway) in response to OPTIONS request for 'https://github.com/Gnucash/gnucash.git' I have no idea why though. Has anyone else managed to successfully checkout the git repo via the svn interface ? Hmmph. I was able to access one of my normal repos, but get the same result as you with Gnucash. I added a comment about that to the blog page above. We'll see. Same for me - I was able to svn checkout one of my other normal git repos, but with gnucash I, too, got 502 Bad Gateway. However, it came up with a trunk and branches directory, so that I had to append trunk to the URL to get a useful source tree. For gnucash, this didn't change the problem, though. Regards, Christian ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
Hi, On Wed, Nov 9, 2011 at 2:30 PM, Christian Stimming christ...@cstimming.dewrote: [...] Same for me - I was able to svn checkout one of my other normal git repos, but with gnucash I, too, got 502 Bad Gateway. However, it came up with a trunk and branches directory, so that I had to append trunk to the URL to get a useful source tree. For gnucash, this didn't change the problem, though. I think this is the issue I mentioned yesterday--you need a `master' branch in the Git repo to do a Subversion checkout. Regards, Yawar ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
John Ralls jra...@ceridwen.us writes: I think only the website set-up needs some more work. All other integration only depends on the availability of a svn checkout, which would already be there on github. The website and the mails that get automatically sent to gnucash-patches and gnucash-changes. The mails may not be an issue. Instead of a mailing list, github provides an rss feed (on your personal account, based on all the projects you have marked for watching). That may be sufficient. I thought github had a hook to send email about a patch? At least when MythTV moved to github they continued getting commit emails. So I'm sure it's possible. I actually like the interface on git.gnome.org better than github's (or trac's). Less froo-froo, and the history is a lot more readable and searchable. OTOH, I do like the line-by-line comment feature on Github. (I'm not suggesting we should try to move to git.gnome.org. Getting everyone access would be a big PITA. But we could host whatever they're using for a browser on code.gnucash.org.) I'm happy to install something for us. I just need to know what to install and how to configure it. :) Regards, John Ralls -derek -- Derek Atkins, SB '93 MIT EE, SM '95 MIT Media Laboratory Member, MIT Student Information Processing Board (SIPB) URL: http://web.mit.edu/warlord/PP-ASEL-IA N1NWH warl...@mit.eduPGP key available ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
On Nov 8, 2011, at 5:01 AM, Derek Atkins wrote: John Ralls jra...@ceridwen.us writes: I actually like the interface on git.gnome.org better than github's (or trac's). Less froo-froo, and the history is a lot more readable and searchable. OTOH, I do like the line-by-line comment feature on Github. (I'm not suggesting we should try to move to git.gnome.org. Getting everyone access would be a big PITA. But we could host whatever they're using for a browser on code.gnucash.org.) I'm happy to install something for us. I just need to know what to install and how to configure it. :) Turns out that Gnome is using CGit [1]. They've probably written some css to make it look the way they want and adjusted some of the many options. In short: Install, easy. Configure, not so much. Unless someone has a week or two to mess with it (I sure don't), probably better to stay with github. Regards, John Ralls ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
Zitat von Derek Atkins de...@ihtfp.com: We've been using the Github repos pretty successfully for 8 months or so now. I think all of the main committers this year (meaning more than a commit or so per month ) are using it. Meanwhile, Derek has upgraded the servers and moved them to a new location, so there should be no technical barrier to switching to git for the main repository. I'd love to see git to be the main repository. Would that mean we drop the svn repo ? The windows automatic build scripts still depend on svn and won't work with git. Right now the web site update, docs nightly build script, doxygen nightly build script, and win32 nightly build script all depend on SVN. All this infrastructure would need to migrate over to git. Would we continue to host the main git repo on Github? Or would we keep the main repo on code.gnucash.org? If the latter, we would need to figure out how to authorize pushing as well. My suggestion is to move the main git repo also to a github one, and not maintaining our own source code server. My reasons for this is an easier administration of adding main commit access, and also a much easier handing over of the administration priviledges itself - which is currently hard coded to Derek as the root account owner on the gnucash box. If we decided to move not only to git, but also to github, we'd solve most of the build script integration issues: github offers the additional feature of accessing its git repos also by a svn client, see https://github.com/blog/966-improved-subversion-client-support I think only the website set-up needs some more work. All other integration only depends on the availability of a svn checkout, which would already be there on github. Regards, Christian ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
On 2011-11-07, at 04:54, Christian Stimming wrote: […] My suggestion is to move the main git repo also to a github one, and not maintaining our own source code server. My reasons for this is an easier administration of adding main commit access, and also a much easier handing over of the administration priviledges itself - which is currently hard coded to Derek as the root account owner on the gnucash box. If we decided to move not only to git, but also to github, we'd solve most of the build script integration issues: github offers the additional feature of accessing its git repos also by a svn client, see https://github.com/blog/966-improved-subversion-client-support Looks good: but if we use this setup, the main development branch in GitHub has to be called ‘master’, because that’s what GitHub expects to find when it’s looking for the branch to map to Subversion’s ‘trunk’ (see the last line of the blog post). Regards, Yawar PGP.sig Description: This is a digitally signed message part ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
On Nov 7, 2011, at 5:04 AM, Yawar Amin wrote: On 2011-11-07, at 04:54, Christian Stimming wrote: […] My suggestion is to move the main git repo also to a github one, and not maintaining our own source code server. My reasons for this is an easier administration of adding main commit access, and also a much easier handing over of the administration priviledges itself - which is currently hard coded to Derek as the root account owner on the gnucash box. If we decided to move not only to git, but also to github, we'd solve most of the build script integration issues: github offers the additional feature of accessing its git repos also by a svn client, see https://github.com/blog/966-improved-subversion-client-support Looks good: but if we use this setup, the main development branch in GitHub has to be called ‘master’, because that’s what GitHub expects to find when it’s looking for the branch to map to Subversion’s ‘trunk’ (see the last line of the blog post). We'd want to do that anyway, because git expects its main branch to be called master, as do most git users. Regards, John Ralls ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
On maandag 7 november 2011, Christian Stimming wrote: Zitat von Derek Atkins de...@ihtfp.com: We've been using the Github repos pretty successfully for 8 months or so now. I think all of the main committers this year (meaning more than a commit or so per month ) are using it. Meanwhile, Derek has upgraded the servers and moved them to a new location, so there should be no technical barrier to switching to git for the main repository. I'd love to see git to be the main repository. Would that mean we drop the svn repo ? The windows automatic build scripts still depend on svn and won't work with git. Right now the web site update, docs nightly build script, doxygen nightly build script, and win32 nightly build script all depend on SVN. All this infrastructure would need to migrate over to git. Would we continue to host the main git repo on Github? Or would we keep the main repo on code.gnucash.org? If the latter, we would need to figure out how to authorize pushing as well. My suggestion is to move the main git repo also to a github one, and not maintaining our own source code server. My reasons for this is an easier administration of adding main commit access, and also a much easier handing over of the administration priviledges itself - which is currently hard coded to Derek as the root account owner on the gnucash box. Ok by me. If we decided to move not only to git, but also to github, we'd solve most of the build script integration issues: github offers the additional feature of accessing its git repos also by a svn client, see https://github.com/blog/966-improved-subversion-client-support Very interesting. I wasn't aware of this. I think only the website set-up needs some more work. All other integration only depends on the availability of a svn checkout, which would already be there on github. The website and the mails that get automatically sent to gnucash-patches and gnucash-changes. The mails may not be an issue. Instead of a mailing list, github provides an rss feed (on your personal account, based on all the projects you have marked for watching). That may be sufficient. If not, I found that git does provide service hooks upon push, but I'm not quite sure which ones could implement what we need: https://github.com/Gnucash/gnucash/admin/hooks (url only accessible by gnucash admins on github) - The e-mail hook may work as an alternative to the two commit mails we send now, although there's not much we can configure. - The Post-receiveURL hook could possibly be used for the website update parts. We would have to provide a post listener somewhere though that can trigger the proper actions. While we are setting up such a service, it could just as well also be used to send the e-mails instead of the more limited e- mail hook above. Other hooks that could potentially be useful, though not required for the migration: - Bugzilla hook, which automatically adds comments to bugs if a bug number appears in the commit message. - Trac, interfaces with a trac installation (which we also still have) Geert ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
On Nov 7, 2011, at 11:07 AM, Geert Janssens wrote: On maandag 7 november 2011, Christian Stimming wrote: Zitat von Derek Atkins de...@ihtfp.com: We've been using the Github repos pretty successfully for 8 months or so now. I think all of the main committers this year (meaning more than a commit or so per month ) are using it. Meanwhile, Derek has upgraded the servers and moved them to a new location, so there should be no technical barrier to switching to git for the main repository. I'd love to see git to be the main repository. Would that mean we drop the svn repo ? The windows automatic build scripts still depend on svn and won't work with git. Right now the web site update, docs nightly build script, doxygen nightly build script, and win32 nightly build script all depend on SVN. All this infrastructure would need to migrate over to git. Would we continue to host the main git repo on Github? Or would we keep the main repo on code.gnucash.org? If the latter, we would need to figure out how to authorize pushing as well. My suggestion is to move the main git repo also to a github one, and not maintaining our own source code server. My reasons for this is an easier administration of adding main commit access, and also a much easier handing over of the administration priviledges itself - which is currently hard coded to Derek as the root account owner on the gnucash box. Ok by me. If we decided to move not only to git, but also to github, we'd solve most of the build script integration issues: github offers the additional feature of accessing its git repos also by a svn client, see https://github.com/blog/966-improved-subversion-client-support Very interesting. I wasn't aware of this. I think only the website set-up needs some more work. All other integration only depends on the availability of a svn checkout, which would already be there on github. The website and the mails that get automatically sent to gnucash-patches and gnucash-changes. The mails may not be an issue. Instead of a mailing list, github provides an rss feed (on your personal account, based on all the projects you have marked for watching). That may be sufficient. If not, I found that git does provide service hooks upon push, but I'm not quite sure which ones could implement what we need: https://github.com/Gnucash/gnucash/admin/hooks (url only accessible by gnucash admins on github) - The e-mail hook may work as an alternative to the two commit mails we send now, although there's not much we can configure. - The Post-receiveURL hook could possibly be used for the website update parts. We would have to provide a post listener somewhere though that can trigger the proper actions. While we are setting up such a service, it could just as well also be used to send the e-mails instead of the more limited e- mail hook above. Other hooks that could potentially be useful, though not required for the migration: - Bugzilla hook, which automatically adds comments to bugs if a bug number appears in the commit message. - Trac, interfaces with a trac installation (which we also still have) We can try setting up the hooks now. The events that Github sees are the same as they will be later, it's just that there will be more pushers. I don't know if we necessarily want to automatically add comments to bugs. What would be nice is for the bug reference getting turned into a link when browsing on Github so that you could just click on it and be taken to bugzilla. I don't see any need for Trac after migration. We're only using it for browsing the repo. I actually like the interface on git.gnome.org better than github's (or trac's). Less froo-froo, and the history is a lot more readable and searchable. OTOH, I do like the line-by-line comment feature on Github. (I'm not suggesting we should try to move to git.gnome.org. Getting everyone access would be a big PITA. But we could host whatever they're using for a browser on code.gnucash.org.) Regards, John Ralls ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
Hi, On Mon, Nov 7, 2011 at 4:54 AM, Christian Stimming christ...@cstimming.dewrote: Zitat von Derek Atkins de...@ihtfp.com: [...] [...] The windows automatic build scripts still depend on svn and won't work with git. Right now the web site update, docs nightly build script, doxygen nightly build script, and win32 nightly build script all depend on SVN. All this infrastructure would need to migrate over to git. [...] [...] I've been wondering--are these build scripts under source control? Maybe we should check them into a GitHub repo? Best, Yawar ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
Hi, On Mon, November 7, 2011 4:58 pm, Yawar Amin wrote: Hi, On Mon, Nov 7, 2011 at 4:54 AM, Christian Stimming christ...@cstimming.dewrote: Zitat von Derek Atkins de...@ihtfp.com: [...] [...] The windows automatic build scripts still depend on svn and won't work with git. Right now the web site update, docs nightly build script, doxygen nightly build script, and win32 nightly build script all depend on SVN. All this infrastructure would need to migrate over to git. [...] [...] I've been wondering--are these build scripts under source control? Maybe we should check them into a GitHub repo? They are not.. (well, the win32 scripts are, the rest are not). The web update script is specifically not under source code control for security reasons. The docs and doxygen scripts are not under source code control because they are relatively short and it never seemed like the right thing... Moreover, I didn't want to svn update into cron.daily. ;) Best, Yawar -derek -- Derek Atkins 617-623-3745 de...@ihtfp.com www.ihtfp.com Computer and Internet Security Consultant ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Git Migration: github with svn access
On maandag 7 november 2011, Yawar Amin wrote: Hi, On Mon, Nov 7, 2011 at 4:54 AM, Christian Stimming christ...@cstimming.dewrote: Zitat von Derek Atkins de...@ihtfp.com: [...] [...] The windows automatic build scripts still depend on svn and won't work with git. Right now the web site update, docs nightly build script, doxygen nightly build script, and win32 nightly build script all depend on SVN. All this infrastructure would need to migrate over to git. [...] [...] I've been wondering--are these build scripts under source control? Maybe we should check them into a GitHub repo? At least some of them are. You will find them in packaging/win32 [1] In there you will find scripts such as daily_build.sh, build_tags.sh, install- impl.sh,... Those are part of a bunch of scripts used to build gnucash automatically every night and when new releases are tagged. I'm not sure where the docs and doxygen nightly build scripts live. Perhaps Derek can answer that. The website update is done as part of a commit hook on the gnucash svn server. This pushes each website related commit through to the webserver. The code for this can be found in the meta repository [2], in the post-commit script. Geert [1] http://svn.gnucash.org/trac/browser/gnucash/trunk/packaging/win32 [2] http://svn.gnucash.org/trac/browser/meta/hooks ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
