Re: [chromium-dev] Re: refactoring and git

2009-11-10 Thread Evan Martin
On Fri, Nov 6, 2009 at 10:50 AM, Yaar Schnitman y...@chromium.org wrote: Git is totally confusing my renames and new files. Take a look:  .../{WebSearchableFormData.h = WebElement.h}      |   49 -  webkit/api/public/WebSearchableFormData.h          |    4 +-  

[chromium-dev] Re: refactoring and git

2009-11-03 Thread Evan Martin
I'm not sure which news you're referring to. :) To answer Jeremy's request: briefly, git doesn't track renames at all (which are conceptually differences between versions) which makes sense when you consider what it does track (conceptually, only collections of files and an ordering between

[chromium-dev] Re: refactoring and git

2009-11-03 Thread Paweł Hajdan Jr .
On Tue, Nov 3, 2009 at 16:58, Evan Martin e...@chromium.org wrote: I'm not sure which news you're referring to. :) To the one that the files are supposed to by svn-copied by git, that there is a command to check for that, and that you offered to help in case of problems. :)

[chromium-dev] Re: refactoring and git

2009-11-03 Thread Erik Kay
Are there best practices we can follow that will help the scripts be more accurate? For example, if we move the file, make sure that we commit it in the new location before making any text changes? If so, we could at least document that. Erik On Tue, Nov 3, 2009 at 7:58 AM, Evan Martin

[chromium-dev] Re: refactoring and git

2009-11-03 Thread Evan Martin
Generally it should Just Work. If it doesn't, I'd like to hear about it. http://code.google.com/p/chromium/wiki/UsingGit#Renames_and_Copies On Tue, Nov 3, 2009 at 9:16 AM, Erik Kay erik...@chromium.org wrote: Are there best practices we can follow that will help the scripts be more accurate?

[chromium-dev] Re: refactoring and git

2009-11-03 Thread Finnur Thorarinsson
Another option is to do one TBR commit where you just fork the file with no changes, then work again as normal. May I suggest using gcl instead for this changelist... Would that be possible? I don't like the idea of losing all the commit history of the file he's working on, just because git

[chromium-dev] Re: refactoring and git

2009-11-03 Thread Drew Wilson
In my case, git didn't quite figure out that my refactoring (splitting a file into two) should also link up the new file to the history of the old. There are magic flags I could pass (-Cn) to make git more aggressive about matching up files to histories, but it turns out that passing those flags

[chromium-dev] Re: refactoring and git

2009-11-03 Thread Aaron Boodman
On Tue, Nov 3, 2009 at 9:18 AM, Evan Martin e...@chromium.org wrote: Generally it should Just Work.  If it doesn't, I'd like to hear about it. http://code.google.com/p/chromium/wiki/UsingGit#Renames_and_Copies FWIW, it never used to work at all for me, but it recently started working. Did

[chromium-dev] Re: refactoring and git

2009-11-03 Thread Evan Martin
Another option is to do one TBR commit where you just fork the file with no changes, then work again as normal. Pretty ugly though. :) On Tue, Nov 3, 2009 at 9:29 AM, Drew Wilson atwil...@chromium.org wrote: In my case, git didn't quite figure out that my refactoring (splitting a file into

[chromium-dev] Re: refactoring and git

2009-11-02 Thread Evan Martin
On Mon, Nov 2, 2009 at 2:47 PM, Drew Wilson atwil...@chromium.org wrote: I'm doing some refactoring in the chromium worker code, and I got the following review feedback: small request: can the files that were branched from existing files be svn copy'd instead of copying manually and svn

[chromium-dev] Re: refactoring and git

2009-11-02 Thread Paweł Hajdan Jr .
That's a good news. Can that info be put somewhere in the UsingGit wiki page? On Mon, Nov 2, 2009 at 23:56, Evan Martin e...@chromium.org wrote: On Mon, Nov 2, 2009 at 2:47 PM, Drew Wilson atwil...@chromium.org wrote: I'm doing some refactoring in the chromium worker code, and I got the