Bug 123747
| Summary: | svn-apply fails to apply a patch for undoing a rollout | ||
|---|---|---|---|
| Product: | WebKit | Reporter: | Alexey Proskuryakov <ap> |
| Component: | Tools / Tests | Assignee: | Nobody <webkit-unassigned> |
| Status: | NEW | ||
| Severity: | Normal | CC: | ahmad.saleem792, dbates, ddkilzer, lforschler, matthew_hanson |
| Priority: | P2 | ||
| Version: | 528+ (Nightly build) | ||
| Hardware: | Unspecified | ||
| OS: | Unspecified | ||
Alexey Proskuryakov
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 @@
...
| Attachments | ||
|---|---|---|
| Add attachment proposed patch, testcase, etc. |
Ahmad Saleem
@ap - SVN is gone and now GitHub is in the picture, do we need to fix this?
Alexey Proskuryakov
Not sure. We still use svn-apply, even though its name is misleading now.