Well, the more git-idiomatic usage is to "git commit" your work in progress often, in particular before updating. This wouldn't touch Node.h at all, it just upates the index (in the .git hidden subdir). Then the rebase also wouldn't touch Node.h, unless there were changes to it upstream.
I just recommended the stash/update/pop sequence because it more closely matched the SVN workflow which you like, and I'm trying to figure out how hard it would be to support this workflow with git. I hadn't thought about the issue of extra file touches, though - good catch. Here's a better alternative: git commit -a -c "temp commit" && git pull --rebase origin/master (fix any conflicts and finish the rebase with git rebase --continue if necessary) git reset HEAD^ Instead of using the stash, that puts all your working copy changes into a commit, fetches, and then gets rid of the commit (leaving the changes still in the working copy). There might be some weirdness if there are new files/subdirs instead of just changes to existing files - I'd need to check how that gets handled and possibly tweak some commandline parameters. ________________________________ From: webkit-dev-boun...@lists.webkit.org [webkit-dev-boun...@lists.webkit.org] on behalf of Ryosuke Niwa [rn...@webkit.org] Sent: Friday, March 09, 2012 7:01 PM To: Ashod Nakashian Cc: WebKit Development Subject: Re: [webkit-dev] Moving to Git? First, a follow up on my old post since my message was cut off in the middle: On Thu, Mar 8, 2012 at 1:25 PM, Ryosuke Niwa <rn...@webkit.org<mailto:rn...@webkit.org>> wrote: On Thu, Mar 8, 2012 at 1:19 PM, Joe Mason <jma...@rim.com<mailto:jma...@rim.com>> wrote: This is only slightly more complicated I'd say astoundingly more complicated because of the fact that you're unapplying changes, updating the checkout, and reapplying changes. This seemingly innocent sequence of operations have an annoying side-effects of touching all files you've modified locally and haven't committed. So for example if you have any changes to Node.h and run this set of operations, then git will touch Node.h twice by stashing and applying. This would mean that I would be rebuilding the world even if all changes I get from masters were in webkitpy or LayoutTests. Are there an easy way to work around this issue as well? (other than committing changes, of course) On Fri, Mar 9, 2012 at 3:54 PM, Ashod Nakashian <ashodnakash...@yahoo.com<mailto:ashodnakash...@yahoo.com>> wrote: After all, what prompted me to raise this issue is because some svn scripts are outdated and before fixing them I thought may be there wasn't much use for them in the first place (otherwise, someone with a bigger contribution volume would certainly have noticed and fixed them sooner than me). I suspect the only reason the particular bug hadn't been fixed is that we have very few contributors who develop on Windows. - Ryosuke --------------------------------------------------------------------- This transmission (including any attachments) may contain confidential information, privileged material (including material protected by the solicitor-client or other applicable privileges), or constitute non-public information. Any use of this information by anyone other than the intended recipient is prohibited. If you have received this transmission in error, please immediately reply to the sender and delete this information from your system. Use, dissemination, distribution, or reproduction of this transmission by unintended recipients is not authorized and may be unlawful. _______________________________________________ webkit-dev mailing list webkit-dev@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-dev
