{"thread":{"id":"2520","subject":"pushing patches to an imap folder","startedAt":"2005-11-15T08:20:55Z","lastAt":"2005-11-16T23:49:49Z","messageCount":10,"participants":["Mike McCormack","Junio C Hamano","Johannes Schindelin","Martin Langhoff","Matthias Urlichs"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"11878","messageId":"43799A67.9030705@codeweavers.com","threadId":"2520","inReplyTo":null,"subject":"pushing patches to an imap folder","fromName":"Mike McCormack","fromEmail":"mike@codeweavers.com","sentAt":"2005-11-15T08:20:55Z","receivedAt":"2005-11-15T08:20:55Z","isPatch":false,"sender":{"key":"mike@codeweavers.com","avatar":null},"body":"Hi,\n\nI hacked up git-format-patch and isync to create a program to push \npatches from git into an imap folder.  This improve my workflow with git \nquite a bit.\n\nIt's pretty Wine specific at the moment, but I'd be happy to try and \ncreate a patch for git if I had a little advice on where to store the \nconfiguration... an imap server (host/port/name/pass or ssh command) \nwith a mail header/template thrown in.\n\nhttp://mandoo.dyndns.org/mm-send-patch-0.1.tar.gz\n\nComments and flames welcome :)\n\nMike\n"},{"id":"11881","messageId":"7vd5l2qnq6.fsf@assigned-by-dhcp.cox.net","threadId":"2520","inReplyTo":"43799A67.9030705@codeweavers.com","subject":"Re: pushing patches to an imap folder","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-11-15T09:12:01Z","receivedAt":"2005-11-15T09:12:01Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Mike McCormack <mike@codeweavers.com> writes:\n\n> I hacked up git-format-patch and isync to create a program to push \n> patches from git into an imap folder.  This improve my workflow with git \n> quite a bit.\n\nHmph.  How well does the rest of git help your workflow, working\nwith the Wine community?  Especially, how are you keeping track\nof and interoperating with their main CVS repository?  Do you\nhave to do anything special when your patches are accepted by\nthe upstream and echoed back to you when you 'cvs update' from\nthem next time?\n"},{"id":"11886","messageId":"4379B9F6.5020402@codeweavers.com","threadId":"2520","inReplyTo":"7vd5l2qnq6.fsf@assigned-by-dhcp.cox.net","subject":"Re: pushing patches to an imap folder","fromName":"Mike McCormack","fromEmail":"mike@codeweavers.com","sentAt":"2005-11-15T10:35:34Z","receivedAt":"2005-11-15T10:35:34Z","isPatch":false,"sender":{"key":"mike@codeweavers.com","avatar":null},"body":"\nJunio C Hamano wrote:\n\n> Hmph.  How well does the rest of git help your workflow, working\n> with the Wine community?  Especially, how are you keeping track\n> of and interoperating with their main CVS repository? \n\nWe have a (semi-experimental) wine.git tree, which is updated at the \nsame time as the Wine CVS, by the project maintainer:\n\nhttp://source.winehq.org/git/wine.git\n\nIt will probably be maintained in parallel with the Wine CVS for a \nwhile, unless somebody writes a GIT->CVS gateway.\n\nI find git-rebase to be particularly useful.  When I used CVS, sending a \nseries of patches was a pain. I'd contemplated using quilt, but never \ngot round to trying it.\n\nPushing patches from git into a drafts folder means I don't have to \nmanually generate a diff, open a mail, type the mailing list address, \nattach the patch and write/copy-paste a ChangeLog entry.\n\n> Do you\n> have to do anything special when your patches are accepted by\n> the upstream and echoed back to you when you 'cvs update' from\n> them next time?\n\n\"git pull\" is usually sufficient.\n\nMike\n"},{"id":"11889","messageId":"Pine.LNX.4.63.0511151227300.21902@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"2520","inReplyTo":"4379B9F6.5020402@codeweavers.com","subject":"Re: pushing patches to an imap folder","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2005-11-15T11:36:24Z","receivedAt":"2005-11-15T11:36:24Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Tue, 15 Nov 2005, Mike McCormack wrote:\n\n> Junio C Hamano wrote:\n> \n> > Hmph.  How well does the rest of git help your workflow, working with \n> > the Wine community?  Especially, how are you keeping track of and \n> > interoperating with their main CVS repository?\n> \n> We have a (semi-experimental) wine.git tree, which is updated at the \n> same time as the Wine CVS, by the project maintainer:\n> \n> http://source.winehq.org/git/wine.git\n\nThis is cool! I used to track wine with \"git-cvsimport -i\".\n\nMy work flow was like this (not with wine, since I did not have enough \ntime to hack on it in the last months, but with other CVS managed \nprojects):\n\n\"git-cvsimport -i\" every once in a while, followed by \"git pull . origin\" \n(my working branch is always master).\n\nWhen I have something interesting, I make a topic branch from origin (\"git \ncheckout -b eyes_apple origin\"), and pick the interesting commits from \nmaster (\"git cherry-pick SHA1\").\n\nSometimes I pick multiple commits with the \"-n\" flag, so that I can hide \nmy shortcomings, committing with the message of the first commit (\"git \ncommit -C SHA1\").\n\nThen, I use git-format-patch to generate the patches, which I hand-edit to \nmake sure there is no typo, and no unwanted changes slipped in. Then, I \nsend the message(s).\n\n> It will probably be maintained in parallel with the Wine CVS for a while,\n> unless somebody writes a GIT->CVS gateway.\n\nIt would be cool to have something like git-cvs-daemon, which simulates a \nCVS server.\n\nCiao,\nDscho\n"},{"id":"11927","messageId":"7vzmo5ka20.fsf@assigned-by-dhcp.cox.net","threadId":"2520","inReplyTo":"4379B9F6.5020402@codeweavers.com","subject":"Re: pushing patches to an imap folder","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-11-15T19:03:51Z","receivedAt":"2005-11-15T19:03:51Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Mike McCormack <mike@codeweavers.com> writes:\n\n> We have a (semi-experimental) wine.git tree, which is updated at the \n> same time as the Wine CVS, by the project maintainer:\n>\n> http://source.winehq.org/git/wine.git\n\nWow.  How is the acceptance by wine community?  Favorable, I\nhope.\n\nIt would be nice before 1.0 happens to have a list of publicly\nvisible projects and people who use git as part of the workflow;\nthe degree would vary per project, from using it as the primary\nrepository (the kernel, I guess) to merely accessible with git.\n\n> It will probably be maintained in parallel with the Wine CVS for a \n> while, unless somebody writes a GIT->CVS gateway.\n\ngit-cvsexportcommit?  I haven't had a chance to use it myself,\nalthough I have to interoperate with CVS in some projects.\nMartin, do you want to do a plug (or brag) here?\n\n> I find git-rebase to be particularly useful.\n\nIt is handy, especially for simple things like rebasing topic\nbranches, when the things are of managable size without using\nquilt or StGIT.  Do you manage binary files?\n\n> Pushing patches from git into a drafts folder means I don't have to \n> manually generate a diff, open a mail, type the mailing list address, \n> attach the patch and write/copy-paste a ChangeLog entry.\n\nYes, I saw that value there.  Maybe adding hooks to format-patch\nso that it can do form-letter-ish things you had to add there\nwithout patching might help?  I dunno.\n"},{"id":"11978","messageId":"437A9109.6010101@codeweavers.com","threadId":"2520","inReplyTo":"7vzmo5ka20.fsf@assigned-by-dhcp.cox.net","subject":"Re: pushing patches to an imap folder","fromName":"Mike McCormack","fromEmail":"mike@codeweavers.com","sentAt":"2005-11-16T01:53:13Z","receivedAt":"2005-11-16T01:53:13Z","isPatch":false,"sender":{"key":"mike@codeweavers.com","avatar":null},"body":"\nJunio C Hamano wrote:\n\n> Wow.  How is the acceptance by wine community?  Favorable, I\n> hope.\n\nwine.git hasn't been announced on any of the wine mailing lists yet.  As \nlong as we don't get rid of CVS entirely, I don't think there'll be too \nmany complaints.  Hopefully when it's announced, we'll have a few GIT \nusers who can tell people why it's good to use.\n\n> git-cvsexportcommit?  I haven't had a chance to use it myself,\n> although I have to interoperate with CVS in some projects.\n> Martin, do you want to do a plug (or brag) here?\n\ngit-cvsexportcommit looks nice.  I guess Alexandre is using something \nlike that now.  I was thinking more ambitiously... something like a \ngit-cvsd.  That would be a pretty awesome migration tool :)\n\n> It is handy, especially for simple things like rebasing topic\n> branches, when the things are of managable size without using\n> quilt or StGIT.  Do you manage binary files?\n\nNo, there's no binary files in the Wine CVS (or symlinks ;).\n\n> Yes, I saw that value there.  Maybe adding hooks to format-patch\n> so that it can do form-letter-ish things you had to add there\n> without patching might help?  I dunno.\n\nI'll have a go at integrating my code with format-patch.  Hooks for a \ntemplate would be helpful.\n\nMike\n"},{"id":"11989","messageId":"7vek5hcmh4.fsf@assigned-by-dhcp.cox.net","threadId":"2520","inReplyTo":"437A9109.6010101@codeweavers.com","subject":"Re: pushing patches to an imap folder","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-11-16T03:15:03Z","receivedAt":"2005-11-16T03:15:03Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Mike McCormack <mike@codeweavers.com> writes:\n\n> No, there's no binary files in the Wine CVS (or symlinks ;).\n\nHmph.  Kinda surprised.  You guys do not do icons?\n"},{"id":"293889","messageId":"437AA519.5050304@codeweavers.com","threadId":"2520","inReplyTo":"7vek5hcmh4.fsf@assigned-by-dhcp.cox.net","subject":"Re: pushing patches to an imap folder","fromName":"Mike McCormack","fromEmail":"mike@codeweavers.com","sentAt":"2005-11-16T03:18:49Z","receivedAt":"2005-11-16T03:18:49Z","isPatch":false,"sender":{"key":"mike@codeweavers.com","avatar":null},"body":"\nJunio C Hamano wrote:\n\n> Hmph.  Kinda surprised.  You guys do not do icons?\n\nWe do, but we have a tool called bin2res that converts them to text and \nstores them in a comment in the .rc file that they're associated with:\n\nhttp://cvs.winehq.org/cvsweb/~checkout~/wine/dlls/shell32/shres.rc?rev=1.42&content-type=text/plain\n\nThis was done because of trouble with binary files in CVS.\n\n"},{"id":"11993","messageId":"46a038f90511151945q62f59e3cl18ffedc5dd000c7c@mail.gmail.com","threadId":"2520","inReplyTo":"4379B9F6.5020402@codeweavers.com","subject":"Re: pushing patches to an imap folder","fromName":"Martin Langhoff","fromEmail":"martin.langhoff@gmail.com","sentAt":"2005-11-16T03:45:41Z","receivedAt":"2005-11-16T03:45:41Z","isPatch":false,"sender":{"key":"martin.langhoff@gmail.com","avatar":"https://gravatar.com/avatar/1e3f311b6c4c15836501901ca58f8c0b0667246488084ba524d8bc9867e22fd9?d=mp&s=160"},"body":"On 11/15/05, Mike McCormack <mike@codeweavers.com> wrote:\n> It will probably be maintained in parallel with the Wine CVS for a\n> while, unless somebody writes a GIT->CVS gateway.\n\nThe missing 'git-cvsexport' command should be the missing part for the\ngateway. I am not hacking on it right now, but Kevin seemed to be\ngetting started in that direction. If not, I'll probably hack\nsomething together eventually.\n\nI don't have any project currently migrating to GIT... yet ;-)\n\n\n\nmartin\n"},{"id":"12065","messageId":"pan.2005.11.16.23.49.48.613211@smurf.noris.de","threadId":"2520","inReplyTo":"Pine.LNX.4.63.0511151227300.21902@wbgn013.biozentrum.uni-wuerzburg.de","subject":"Re: pushing patches to an imap folder","fromName":"Matthias Urlichs","fromEmail":"smurf@smurf.noris.de","sentAt":"2005-11-16T23:49:49Z","receivedAt":"2005-11-16T23:49:49Z","isPatch":false,"sender":{"key":"matthias@urlichs.de","avatar":"https://gravatar.com/avatar/2708905af227313eba6f2b2ae0f7d0259b5ac5d71baef58fe5a13c699ce0bbf0?d=mp&s=160"},"body":"Hi, Johannes Schindelin wrote:\n\n> It would be cool to have something like git-cvs-daemon, which simulates a \n> CVS server.\n\nread-only would not be that difficult. You'd have to cache CVS version\nnumbers for individual files and decide on a branch ordering, but those\nare basically non-problems.\n\nDon't even *think* about committing.\n\n-- \nMatthias Urlichs   |   {M:U} IT Design @ m-u-it.de   |  smurf@smurf.noris.de\nDisclaimer: The quote was selected randomly. Really. | http://smurf.noris.de\n - -\nConscience is what hurts when everything else feels so good.\n"}]}