Bug 123747 - svn-apply fails to apply a patch for undoing a rollout
Summary: svn-apply fails to apply a patch for undoing a rollout
Status: NEW
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Nobody
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-11-04 10:22 PST by Alexey Proskuryakov
Modified: 2023-09-20 10:21 PDT (History)
5 users (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Alexey Proskuryakov 2013-11-04 10:22:37 PST 
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 @@
...
Comment 1 Ahmad Saleem 2023-09-20 10:13:38 PDT 
@ap - SVN is gone and now GitHub is in the picture, do we need to fix this?
Comment 2 Alexey Proskuryakov 2023-09-20 10:21:56 PDT 
Not sure. We still use svn-apply, even though its name is misleading now.