[webkit-dev] r45939 broke my workflow
Geoffrey Garen
ggaren at apple.com
Fri Aug 21 13:10:31 PDT 2009
Hi.
r45939 broke my workflow. Here's the related bugzilla bug: https://bugs.webkit.org/show_bug.cgi?id=26999
.
Old "Roll out a patch" workflow:
cd JavaScriptCore
svn-create-patch > patch.txt
svn-unapply patch.txt
Old "Roll in a patch" workflow:
cd JavaScriptCore
svn-apply patch.txt
These old ways of doing things no longer work because svn-apply and
svn-unapply don't match svn-create-patch's new behavior of changing to
the WebKit root directory if you're currently working in a WebKit
subdirectory.
Here's an example command-line interaction:
> ~/webkit/WebKitTools/Scripts$ svn-create-patch > ro.txt
> ~/webkit/WebKitTools/Scripts$ svn-unapply !$
> svn-unapply ro.txt
> can't find file to patch at input line 5
> Perhaps you used the wrong -p or --strip option?
> The text leading up to this was:
> --------------------------
> |Index: WebKitTools/Scripts/webkitdirs.pm
> |===================================================================
> |--- WebKitTools/Scripts/webkitdirs.pm (revision 47638)
> |+++ WebKitTools/Scripts/webkitdirs.pm (working copy)
> --------------------------
> File to patch: ^C'WebKitTools/Scripts' is not a directory at ./svn-
> unapply line 315, <> line 9.
I tried to ignore this for a while, but it's really causing problems
for me and at least one other WebKit developer.
Should we revert r45939?
Is there an easy fix to svn-apply and svn-unapply that you can make?
Thanks,
Geoff
More information about the webkit-dev
mailing list