{"thread":{"id":"15105","subject":"The state and future of the git/mingw** reposiories?","startedAt":"2008-08-20T11:23:09Z","lastAt":"2008-08-20T21:22:15Z","messageCount":3,"participants":["Petr Baudis","Johannes Sixt","Steffen Prohaska"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"87811","messageId":"20080820112309.GH10544@machine.or.cz","threadId":"15105","inReplyTo":null,"subject":"The state and future of the git/mingw** reposiories?","fromName":"Petr Baudis","fromEmail":"pasky@suse.cz","sentAt":"2008-08-20T11:23:09Z","receivedAt":"2008-08-20T11:23:09Z","isPatch":false,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"  Hi,\n\n  I'm currently doing some MSysGit hacking (mostly git-gui-related) and\nI'm wondering what should I actually base my work on, considering the\nstatement of 1.6.0 release notes:\n\n\tSource changes needed for porting to MinGW environment are now\n\tall in the main git.git codebase.\n\nHowever, git diff junio/master...mingw/master shows quite a few\ndifferences - is there any plan to merge these? If so, do you plan to\nmaintain the mingw fork indefinitely anyway as a staging area for your\npatches that you plan to push upstream, or is it going to be phased out\neventually?\n\nI'm even more confused about the git/mingw/4msysgit.git repository,\nthough. The branches here seem to be ... *insert 10 minutes of clicking\nthrough dense gitk graphs* ... random mix of git.git and git/mingw.git\nmerges, but git diff mingw/master...origin/devel turns out to be fairly\nminimal - still, some of the changes look quite generic. Again, is there\nany upstream merge plan?\n\nWhat is the branch structure of git/mingw/4msysgit.git? The 'master'\nbranch still points to 1.5.6, the 'next' branch points to something...\nI can't quite pinpoint and the 'devel' branch seems to be 1.6.0 +\nmingw/master. Who is supposed to use which one?\n\nOverally, the situation seems to be quite confusing - I would appreciate\na lot if you could clarify the relationship between all the forks and\ntheir branches. It would be great to have this in the project READMEs at\nrepo.or.cz so that casual visitors get this knowledge. I tried to look\naround quite a bit, but could not find any up-to-date description of\nthis; if I missed it, please point me at the right place.\n\nThanks,\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nThe next generation of interesting software will be done\non the Macintosh, not the IBM PC.  -- Bill Gates\n"},{"id":"87863","messageId":"200808202218.35626.johannes.sixt@telecom.at","threadId":"15105","inReplyTo":"20080820112309.GH10544@machine.or.cz","subject":"Re: The state and future of the git/mingw** reposiories?","fromName":"Johannes Sixt","fromEmail":"johannes.sixt@telecom.at","sentAt":"2008-08-20T20:18:35Z","receivedAt":"2008-08-20T20:18:35Z","isPatch":false,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"On Mittwoch, 20. August 2008, Petr Baudis wrote:\n>   Hi,\n>\n>   I'm currently doing some MSysGit hacking (mostly git-gui-related) and\n> I'm wondering what should I actually base my work on, considering the\n> statement of 1.6.0 release notes:\n>\n> \tSource changes needed for porting to MinGW environment are now\n> \tall in the main git.git codebase.\n\nIf all you need is a mostly working git, you can build off of git.git \n(assuming you have the build environment that msysgit provides).\n\n> However, git diff junio/master...mingw/master shows quite a few\n> differences - is there any plan to merge these?\n\nYou see three kinds of differences:\n\n- Changes in the test suite.\n- Perl related changes (most notably, git-add--interactive in git.git does not \nwork on MinGW without these changes).\n- One or two gitk related fixes.\n\nAll of them will be sent upstream some day.\n\nIf you need one of the areas that these changes touches, then you can work off \nof mingw.git.\n\n> If so, do you plan to \n> maintain the mingw fork indefinitely anyway as a staging area for your\n> patches that you plan to push upstream, or is it going to be phased out\n> eventually?\n\nI hope I can reset mingw.git to git.git some day. But I plan to keep it as \nstaging area for patches.\n\n-- Hannes\n"},{"id":"87884","messageId":"1CB66104-4E38-4402-BF9F-2AB1284D76D6@zib.de","threadId":"15105","inReplyTo":"200808202218.35626.johannes.sixt@telecom.at","subject":"Re: The state and future of the git/mingw** reposiories?","fromName":"Steffen Prohaska","fromEmail":"prohaska@zib.de","sentAt":"2008-08-20T21:22:15Z","receivedAt":"2008-08-20T21:22:15Z","isPatch":false,"sender":{"key":"prohaska@zib.de","avatar":"https://avatars.githubusercontent.com/u/217580?v=4"},"body":"\nOn Aug 20, 2008, at 10:18 PM, Johannes Sixt wrote:\n\n> On Mittwoch, 20. August 2008, Petr Baudis wrote:\n>>\n>>\n>>  I'm currently doing some MSysGit hacking (mostly git-gui-related)  \n>> and\n>> I'm wondering what should I actually base my work on, considering the\n>> statement of 1.6.0 release notes:\n>>\n>> \tSource changes needed for porting to MinGW environment are now\n>> \tall in the main git.git codebase.\n>\n> If all you need is a mostly working git, you can build off of git.git\n> (assuming you have the build environment that msysgit provides).\n\nI agree.  I suggest that you start branches from Junio's master, unless\nthis is not possible.\n\nUnfortunately, I am not convinced of our current solution for handling\nthe installation prefix on Windows.  Hence, I won't create a 1.6.0\ninstaller.  I have recently proposed a patch series that addresses the\nissues I see:\n\n   http://article.gmane.org/gmane.comp.version-control.git/92605\n\nBut this patch series is not yet ready for Junio's master.\n\nNote also that I'll be completely offline for the next three weeks,\nso you won't see any progress from my side.\n\n\n>> However, git diff junio/master...mingw/master shows quite a few\n>> differences - is there any plan to merge these?\n>\n> You see three kinds of differences:\n>\n> - Changes in the test suite.\n> - Perl related changes (most notably, git-add--interactive in  \n> git.git does not\n> work on MinGW without these changes).\n> - One or two gitk related fixes.\n\nIn 4msysgit.git we have, in addition, the Putty related change that\nwas not accepted by Junio.  I haven't decided what to do with\nthis change.  See\n\n   http://article.gmane.org/gmane.comp.version-control.msysgit/2560\n\nand replies.\n\n\n> All of them will be sent upstream some day.\n>\n> If you need one of the areas that these changes touche, then you can  \n> work off\n> of mingw.git.\n>\n>> If so, do you plan to\n>> maintain the mingw fork indefinitely anyway as a staging area for  \n>> your\n>> patches that you plan to push upstream, or is it going to be phased  \n>> out\n>> eventually?\n>\n> I hope I can reset mingw.git to git.git some day. But I plan to keep  \n> it as\n> staging area for patches.\n>\n>\n>> I'm even more confused about the git/mingw/4msysgit.git repository,\n>> though. The branches here seem to be ... *insert 10 minutes of  \n>> clicking\n>> through dense gitk graphs* ... random mix of git.git and git/ \n>> mingw.git\n>> merges, but git diff mingw/master...origin/devel turns out to be  \n>> fairly\n>> minimal - still, some of the changes look quite generic. Again, is  \n>> there\n>> any upstream merge plan?\n\nI merge from Hannes if he has already merged from Junio.  If Hannes'\nmaster is not up-to-date I merge directly from Junio.  I even merged\na few times directly from Shawn's git-gui master if I needed fixes from\nthere to create a release.\n\n\n\n>> What is the branch structure of git/mingw/4msysgit.git? The 'master'\n>> branch still points to 1.5.6, the 'next' branch points to  \n>> something...\n>> I can't quite pinpoint and the 'devel' branch seems to be 1.6.0 +\n>> mingw/master. Who is supposed to use which one?\n\nI plan to stop supporting 4msysgit asap and replace it with Junio's\ngit.git.  Until then:\n\n  - 'master' points to the last stable version (typically the last\n    release).  The reason is that msysGit will checkout and compile\n    master, so it is required to work.\n\n  - 'devel' is the branch that has all changes planned for the next\n    release.\n\n  - 'next' contains Junio's next + 'devel', so that people could test\n    Junio's next branch.\n\nIn addition to these toplevel branches we have a couple of topic  \nbranches.\n From time to time someone cleans up topic branches; but for some of the\ntopic branches I do not remember (if I ever knew) what they are about.\n\n\tSteffen\n"}]}