Changes between Version 85 and Version 86 of UsingGitWithWebKit

Timestamp:

Jun 17, 2012, 10:34:13 PM (12 years ago)

Author:

yosin@chromium.org

Comment:

Add "Copying file aka svn copy" section

UsingGitWithWebKit

@@ -343 +343 @@
 webkit-patch mark-bug-fixed 12347
 }}}
+== Copying file aka {{{svn copy}}} ==
+The Git does automatic tracking of copied files like what "svn copy" does.
+Although, on default, git checks modified source file and new file.
+There are options which we should tell git to check unmodified source files, -C and --find-copies-harder.
+
+Here is sample workflow how to use -C and --find-copies-harder with "git svn dcommit":
+ * Copy files
+ * Update ChangeLog
+ * {{{git commit}}} and put contents of ChangeLog into git commit log. It will be svn commit message
+ * {{{git svn dcommit -n -C50 --find-copies-harder}}} Dry run
+   Output may be
+   {{{
+Committing to http://svn.webkit.org/repository/webkit/trunk...
+diff-tree b6f4e217870317390ebcd2f4fe7410b8b5220b96~1 b6f4e217870317390ebcd2f4fe7410b8b5220b96
+   }}}
+ * {{{git diff-tree p -C50 --find-copies-harder b6f4e217870317390ebcd2f4fe7410b8b5220b96~1 b6f4e217870317390ebcd2f4fe7410b8b5220b96}}}
+   * Output should be "copy from" and "copy to"
+ * {{{git svn dcommit -C50 --find-copies-harder}}}
+   Output should be looks like:
+   {{{
+Committing to http://svn.webkit.org/repository/webkit/trunk...
+        C Source/WebCore/Foo.cpp
+        C Source/WebCore/ChangeLog
+Committed r123456
+        M Source/WebCore/ChangeLog
+}}}
+
+See also [https://bugs.webkit.org/show_bug.cgi?id=89155 WK-89155](failure example) and [http://trac.webkit.org/changeset/120567 r120567] (successful example)