{"thread":{"id":"4623","subject":"Re: [GIT PATCH] USB patches for 2.6.17","startedAt":"2006-06-22T20:01:47Z","lastAt":"2006-06-22T21:07:13Z","messageCount":4,"participants":["Sam Ravnborg","Petr Baudis","Linus Torvalds"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"22299","messageId":"20060622200147.GA10712@mars.ravnborg.org","threadId":"4623","inReplyTo":"Pine.LNX.4.64.0606221239100.5498@g5.osdl.org","subject":"Re: [GIT PATCH] USB patches for 2.6.17","fromName":"Sam Ravnborg","fromEmail":"sam@ravnborg.org","sentAt":"2006-06-22T20:01:47Z","receivedAt":"2006-06-22T20:01:47Z","isPatch":true,"sender":{"key":"sam@ravnborg.org","avatar":"https://gravatar.com/avatar/168a912606ed0742d840bb365e3cc21db390c36531a58341dc7a069cc1f15f62?d=mp&s=160"},"body":"> I'm just constantly surprised by how people don't even seem to realize \n> what it can do sometimes. Part of it is that development has been pretty \n> active (and some of the things it can do simply weren't there three months \n> ago), but part of it must be because people don't even expect it to be \n> able to do something like that.\n\nPersonally I'm still missing two things:\n1) A command to let me see what this Linus guy have applied compared to\nmy tree - without touching anything in my tree. bk changes -R\n2) A dry-run of a fetch+pull. I can do that if I really study the man\npages I know. But \"git pull --dry-run\" would be more convinient.\n\nOther than that I will say that I'm pleased with the funtionality that\nI use - that's maybe 10% of the possibilities...\n\n\tSam\n\nUsing Tomcat but need to do more? Need to support web services, security?\nGet stuff done quickly with pre-integrated technology to make your job easier\nDownload IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo\nhttp://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642\n_______________________________________________\nlinux-usb-devel@lists.sourceforge.net\nTo unsubscribe, use the last form field at:\nhttps://lists.sourceforge.net/lists/listinfo/linux-usb-devel\n"},{"id":"22303","messageId":"20060622205217.GE21864@pasky.or.cz","threadId":"4623","inReplyTo":"20060622200147.GA10712@mars.ravnborg.org","subject":"Re: [GIT PATCH] USB patches for 2.6.17","fromName":"Petr Baudis","fromEmail":"pasky@suse.cz","sentAt":"2006-06-22T20:52:17Z","receivedAt":"2006-06-22T20:52:17Z","isPatch":true,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"Dear diary, on Thu, Jun 22, 2006 at 10:01:47PM CEST, I got a letter\nwhere Sam Ravnborg <sam@ravnborg.org> said that...\n> Personally I'm still missing two things:\n> 1) A command to let me see what this Linus guy have applied compared to\n> my tree - without touching anything in my tree. bk changes -R\n\nYou can cg-fetch / git fetch and then either \"cg-log -m\" or\n\"git log -r ..origin\".\n\n> 2) A dry-run of a fetch+pull. I can do that if I really study the man\n> pages I know. But \"git pull --dry-run\" would be more convinient.\n\nWhat would that involve? Isn't git pull --no-commit enough?\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\nA person is just about as big as the things that make them angry.\n"},{"id":"22306","messageId":"Pine.LNX.4.64.0606221354070.6483@g5.osdl.org","threadId":"4623","inReplyTo":"20060622200147.GA10712@mars.ravnborg.org","subject":"Re: [GIT PATCH] USB patches for 2.6.17","fromName":"Linus Torvalds","fromEmail":"torvalds@osdl.org","sentAt":"2006-06-22T21:01:09Z","receivedAt":"2006-06-22T21:01:09Z","isPatch":true,"sender":{"key":"torvalds@linux-foundation.org","avatar":"https://avatars.githubusercontent.com/u/1024025?v=4"},"body":"\n\nOn Thu, 22 Jun 2006, Sam Ravnborg wrote:\n> \n> Personally I'm still missing two things:\n> 1) A command to let me see what this Linus guy have applied compared to\n> my tree - without touching anything in my tree. bk changes -R\n\n\tgit fetch linus\n\tgit log ..linus\n\nYes, it will fetch the things into your database, unlike BK, but that's \nkind of the point. That's what makes branches so powerful (you can do a \nlot more than \"bk changes -R\").\n\n> 2) A dry-run of a fetch+pull. I can do that if I really study the man\n> pages I know. But \"git pull --dry-run\" would be more convinient.\n\nHmm? Again, do\n\n\tgit fetch <thing-to-be-fetched>\n\ninto a local branch first. That gets it into your repo, so that you can do \nthings.\n\nAfter that, I'm not quite sure what you mean by \"--dry-run\". Do you mean \nto know about file-level conflicts? You do need to do the merge in order \nto know whether the conflicts can be resolved, but even without doing the \nmerge you can look for _file_level_ conflicts by other means.\n\nI don't think anybody has done it, but a script like\n\n\tOTHER=\"$1\"\n\tBASE=$(git-merge-base HEAD $OTHER) || exit\n\tgit-merge-tree $BASE HEAD $OTHER | grep -v '^0'\n\nwill show if there were file-level conflicts (in a pretty strange format, \nadmittedly).\n\nOf course, 99% of the time, a three-way merge will just handle those fine \n(the output from \"git-merge-tree\" is enough to know to do a three-way \nmerge on temp-files, if you want to try that).\n\n\t\tLinus\n"},{"id":"22309","messageId":"Pine.LNX.4.64.0606221405080.6483@g5.osdl.org","threadId":"4623","inReplyTo":"Pine.LNX.4.64.0606221354070.6483@g5.osdl.org","subject":"Re: [GIT PATCH] USB patches for 2.6.17","fromName":"Linus Torvalds","fromEmail":"torvalds@osdl.org","sentAt":"2006-06-22T21:07:13Z","receivedAt":"2006-06-22T21:07:13Z","isPatch":true,"sender":{"key":"torvalds@linux-foundation.org","avatar":"https://avatars.githubusercontent.com/u/1024025?v=4"},"body":"\n\nOn Thu, 22 Jun 2006, Linus Torvalds wrote:\n> \n> After that, I'm not quite sure what you mean by \"--dry-run\". Do you mean \n> to know about file-level conflicts? You do need to do the merge in order \n> to know whether the conflicts can be resolved, but even without doing the \n> merge you can look for _file_level_ conflicts by other means.\n\nBtw, what you can always do is just\n\n\tgit pull <other-end>\n\t.. look at the result ..\n\tgit reset --hard ORIG_HEAD\n\nand you should be ok. It's obviously not a dry-run, it's more of a \"do it \nand then undo it\", but hey, it should _work_.\n\n(Look out for dirty state, though. \"git pull\" will happily pull into a \ndirty tree if the changes don't actually affect any dirty files. The \"git \nreset --hard\" thing will undo all dirty state, though).\n\n\t\tLinus\n\nUsing Tomcat but need to do more? Need to support web services, security?\nGet stuff done quickly with pre-integrated technology to make your job easier\nDownload IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo\nhttp://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642\n_______________________________________________\nlinux-usb-devel@lists.sourceforge.net\nTo unsubscribe, use the last form field at:\nhttps://lists.sourceforge.net/lists/listinfo/linux-usb-devel\n"}]}