-chromium-reviews +chromium-dev I am testing a simplistic setup with using svn properties to track WebKit versions, and it seems to work pretty well and avoids having to do the extra scrub/commit steps. I am writing this up, will post soon.
:DG< On Fri, Oct 3, 2008 at 2:00 PM, Darin Fisher <[EMAIL PROTECTED]> wrote: > On Fri, Oct 3, 2008 at 1:50 PM, Mark Mentovai <[EMAIL PROTECTED]> wrote: >> >> Darin Fisher wrote: >> > Given the current approach, how do I compute a diff that contains just >> > our >> > changes? >> >> Can we tag virgin WebKit imports for ease of diffing? > > > That would be great. I think that one way to do that is to have a revision > number for all of the files under third_party/WebKit that corresponds to an > exact copy of what lives upstream. Then, we do another CL that layers our > changes on top of that. This process would be repeated each time we merge > so that we always have a clean way to generate a diff and svn log will show > the deltas being re-applied. The downside is that we lose track of why a > delta was applied. > Merge process looks like: > For each modified file, compute diff, overwrite file with the new virgin > file. Commit. Now, re-apply the diff. Commit. > > Does that sound right? > -Darin --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Chromium-dev" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/chromium-dev?hl=en -~----------~----~----~----~------~----~------~--~---
