[Webkit-unassigned] [Bug 32834] New: svn-apply should handle git patches with similarity index, rename and copy directives

bugzilla-daemon at webkit.org bugzilla-daemon at webkit.org
Mon Dec 21 12:09:42 PST 2009


https://bugs.webkit.org/show_bug.cgi?id=32834

           Summary: svn-apply should handle git patches with similarity
                    index, rename and copy directives
           Product: WebKit
           Version: 528+ (Nightly build)
          Platform: All
        OS/Version: All
            Status: NEW
          Severity: Normal
          Priority: P2
         Component: Tools / Tests
        AssignedTo: webkit-unassigned at lists.webkit.org
        ReportedBy: ddkilzer at webkit.org
                CC: eric at webkit.org, abarth at webkit.org


* SUMMARY
If you use the "[diff] renames = copies" git config setting (or the
--find-copies-harder switch) with git diff, git will include information in the
patch that hints at the history of the code and may significantly reduce the
size of the patch.  While git uses only heuristics to accomplish this, it would
be nice if svn-apply understood these directives so that it could map them to
equivalent svn commands.

* EXAMPLES
$ git mv Makefile NMakefile$ git diff --find-copies-harder HEAD
diff --git a/Makefile b/NMakefile
similarity index 100%
rename from Makefile
rename to NMakefile

$ git diff --find-copies-harder HEAD
diff --git a/Makefile b/NMakefile
similarity index 100%
copy from Makefile
copy to NMakefile

$ git mv WebCore/ChangeLog WebCore/ChangeLog-2009-12-21
$ vi WebCore/ChangeLog-2009-12-21
$ git add WebCore/ChangeLog-2009-12-21
$ git diff --find-copies-harder --cached
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog-2009-12-21
similarity index 99%
rename from WebCore/ChangeLog
rename to WebCore/ChangeLog-2009-12-21
index ab18e51..8cb2b03 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog-2009-12-21
@@ -72516,7 +72516,7 @@ form controls that have different validity states.
         * bindings/v8/custom/V8CustomBinding.h:
         * bindings/v8/custom/V8HTMLDataGridElementCustom.cpp: Added.

-2009-06-24  David Kilzer  <ddkilzer at apple.com>
+2009-06-24  David Kilzer  <ddkilzer at webkit.org>

         Build fixes for ENABLE(PLUGIN_PROXY_FOR_VIDEO)


NOTE: For small files (under a certain number of lines), the rename detection
doesn't work.

-- 
Configure bugmail: https://bugs.webkit.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.



More information about the webkit-unassigned mailing list