I'm going to defer to git experts here. I tested some git scenarios when moving JavaScriptGlue and they seemed to work more-or-less automagically, but WebCore might be different due to its size.
I moved the WebCore directory in one atomic "svn move" operation with zero changes, which should help git understand what happened. Adam On Tue, Jan 11, 2011 at 4:20 PM, David Kilzer <[email protected]> wrote: > For git, I'm assuming the following works: > > Local changes: > 1. git stash save "WIP" > 2. git pull --rebase origin (or git svn rebase) > 3. git stash pop > > Branches: > 1. git checkout branchname > 2. git rebase master > > However, it would be interesting to know if "diff.renames=true" or if > "diff.renames=copy" is required, or if "diff.renameLimit" needs to be set. > > Dave > > > On Jan 8, 2011, at 9:44 AM, Dimitri Glazkov wrote: > >> Thanks for your hard work, Adam! >> >> I tried this morning to follow your steps. It worked great, except >> there were a few .orig files left after webkit-patch had run. I >> removed them by hand and was on my way. >> >> :DG< >> >> On Sat, Jan 8, 2011 at 2:47 AM, Adam Barth <[email protected]> wrote: >>> As of r75314, WebCore is now located in Source/WebCore. >>> If you have outstanding patches to WebCore, here's what you can >>> do to avoid merge conflicts: >>> >>> 1) *BEFORE* updating past r75314, create a patch for your change, >>> either with svn-create-patch or by uploading your patch to >>> bugs.webkit.org with webkit-patch. >>> >>> 2) Clean your working copy. I recommend using "webkit-patch clean", >>> but you can also use svn-unapply, "svn revert", "git reset", or >>> whatever you're most confortable with. >>> >>> 3) Update to top-of-tree. >>> >>> 4) Apply your patch using svn-apply or "webkit-patch >>> apply-attachment". As of r75315, svn-apply is smart enough to >>> magically apply the WebCore parts of your patch to >>> Source/WebCore. >>> >>> Please let me know if you have any merge trouble. Hopefully we've got >>> things set up so that the move is relatively painless. Thanks again >>> for your patience. >>> >>> Adam >>> _______________________________________________ >>> webkit-dev mailing list >>> [email protected] >>> http://lists.webkit.org/mailman/listinfo.cgi/webkit-dev >>> >> _______________________________________________ >> webkit-dev mailing list >> [email protected] >> http://lists.webkit.org/mailman/listinfo.cgi/webkit-dev > > _______________________________________________ webkit-dev mailing list [email protected] http://lists.webkit.org/mailman/listinfo.cgi/webkit-dev
