[Webkit-unassigned] [Bug 123747] New: svn-apply fails to apply a patch for undoing a rollout

[bugzilla-daemon at webkit.org]

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

           Summary: svn-apply fails to apply a patch for undoing a rollout
           Product: WebKit
           Version: 528+ (Nightly build)
          Platform: Unspecified
        OS/Version: Unspecified
            Status: NEW
          Severity: Normal
          Priority: P2
         Component: Tools / Tests
        AssignedTo: webkit-unassigned at lists.webkit.org
        ReportedBy: ap at webkit.org
                CC: ddkilzer at webkit.org, dbates at webkit.org,
                    lforschler at apple.com, matthew_hanson at apple.com


I'm trying to re-land a patch that was previously rolled out. So here is what I did:

1. svn merge -c158526 http://svn.webkit.org/repository/webkit/trunk .
2. Edited the code to fix the issue.
3. svn-create-patch
4. Uploaded the patch for landing.

But commit queue failed to apply it, thinking that an added file was copied from somewhere.

The patch is in bug 123669. This is the part that confused svn-apply:

Index: Source/WebCore/crypto/CryptoAlgorithmAesKeyGenParams.h
===================================================================
--- Source/WebCore/crypto/CryptoAlgorithmAesKeyGenParams.h    (revision 158526)    (from Source/WebCore/crypto/CryptoAlgorithmAesKeyGenParams.h:158526)
+++ Source/WebCore/crypto/CryptoAlgorithmAesKeyGenParams.h    (working copy)
@@ -0,0 +1,44 @@
...

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