[webkit-dev] What is the webkit-patch version of svn-unapply?
Lets say I just did webkit-patch upload and I am Subversion user and I now want the patch out of my tree. Does webkit-patch have a command to help me do it? I can’t just use svn revert because that doesn’t handle things like added, removed, and moved files. -- Darin ___ webkit-dev mailing list webkit-dev@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-dev
Re: [webkit-dev] What is the webkit-patch version of svn-unapply?
On Wed, May 19, 2010 at 10:41 AM, Darin Adler da...@apple.com wrote: Lets say I just did webkit-patch upload and I am Subversion user and I now want the patch out of my tree. Does webkit-patch have a command to help me do it? I can’t just use svn revert because that doesn’t handle things like added, removed, and moved files. I've had a similar problem when using SVN. On git, I use the command git reset --hard. Currently, you can use the following command: webkit-patch update --force-clean That runs both the update and the clean steps: http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/webkitpy/tool/commands/download.py#L46 We could expose a command that runs just the clean step: http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/webkitpy/tool/steps/cleanworkingdirectory.py Adam ___ webkit-dev mailing list webkit-dev@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-dev
Re: [webkit-dev] What is the webkit-patch version of svn-unapply?
On May 19, 2010, at 10:56 AM, Adam Barth wrote: On Wed, May 19, 2010 at 10:41 AM, Darin Adler da...@apple.com wrote: Lets say I just did webkit-patch upload and I am Subversion user and I now want the patch out of my tree. Does webkit-patch have a command to help me do it? I can’t just use svn revert because that doesn’t handle things like added, removed, and moved files. I've had a similar problem when using SVN. On git, I use the command git reset --hard. Currently, you can use the following command: webkit-patch update --force-clean That runs both the update and the clean steps: http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/webkitpy/tool/commands/download.py#L46 We could expose a command that runs just the clean step: http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/webkitpy/tool/steps/cleanworkingdirectory.py These aren’t great replacements for svn-unapply for me. All I want to do is remove a particular patch from my tree; updating and reverting everything is both slower and may have unwanted side effects, such as removing changes I made after uploading the patch. I can see how someone would no longer need svn-unapply once they had switched to git. -- Darin ___ webkit-dev mailing list webkit-dev@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-dev
Re: [webkit-dev] What is the webkit-patch version of svn-unapply?
On Wed, May 19, 2010 at 11:06 AM, Darin Adler da...@apple.com wrote: On May 19, 2010, at 10:56 AM, Adam Barth wrote: On Wed, May 19, 2010 at 10:41 AM, Darin Adler da...@apple.com wrote: Lets say I just did webkit-patch upload and I am Subversion user and I now want the patch out of my tree. Does webkit-patch have a command to help me do it? I can’t just use svn revert because that doesn’t handle things like added, removed, and moved files. I've had a similar problem when using SVN. On git, I use the command git reset --hard. Currently, you can use the following command: webkit-patch update --force-clean That runs both the update and the clean steps: http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/webkitpy/tool/commands/download.py#L46 We could expose a command that runs just the clean step: http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/webkitpy/tool/steps/cleanworkingdirectory.py These aren’t great replacements for svn-unapply for me. All I want to do is remove a particular patch from my tree; updating and reverting everything is both slower and may have unwanted side effects, such as removing changes I made after uploading the patch. I can see how someone would no longer need svn-unapply once they had switched to git. Personally, I don't have multiple patches in my tree at the same time, so I don't understand what would be the most convenient for you. Removing the update step is easy, but I'm not sure how you would like to specify the changes to remove from the tree. We could add an unapply-from-attachment command, but that would involve fetching the patch from bugs.webkit.org again... Another option is that the upload command could store a copy of the patch locally that you could then use with svn-apply and svn-unapply directly. Adam ___ webkit-dev mailing list webkit-dev@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-dev
Re: [webkit-dev] What is the webkit-patch version of svn-unapply?
On Wed, May 19, 2010 at 7:15 PM, Adam Barth aba...@webkit.org wrote: On Wed, May 19, 2010 at 11:06 AM, Darin Adler da...@apple.com wrote: On May 19, 2010, at 10:56 AM, Adam Barth wrote: On Wed, May 19, 2010 at 10:41 AM, Darin Adler da...@apple.com wrote: Lets say I just did webkit-patch upload and I am Subversion user and I now want the patch out of my tree. Does webkit-patch have a command to help me do it? I can’t just use svn revert because that doesn’t handle things like added, removed, and moved files. I've had a similar problem when using SVN. On git, I use the command git reset --hard. Currently, you can use the following command: webkit-patch update --force-clean That runs both the update and the clean steps: http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/webkitpy/tool/commands/download.py#L46 We could expose a command that runs just the clean step: http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/webkitpy/tool/steps/cleanworkingdirectory.py These aren’t great replacements for svn-unapply for me. All I want to do is remove a particular patch from my tree; updating and reverting everything is both slower and may have unwanted side effects, such as removing changes I made after uploading the patch. I can see how someone would no longer need svn-unapply once they had switched to git. Personally, I don't have multiple patches in my tree at the same time, so I don't understand what would be the most convenient for you. Removing the update step is easy, but I'm not sure how you would like to specify the changes to remove from the tree. We could add an unapply-from-attachment command, but that would involve fetching the patch from bugs.webkit.org again... Another option is that the upload command could store a copy of the patch locally that you could then use with svn-apply and svn-unapply directly. What if we added an option to webkit-patch upload that unapplies the patch at the end? In fact, for the first iteration, it could simply save the patch in some temporary location and then run 'svn-unapply'. In other words, do what you just described but without the second webkit-patch run. J ___ webkit-dev mailing list webkit-dev@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-dev
Re: [webkit-dev] What is the webkit-patch version of svn-unapply?
On May 19, 2010, at 11:15 AM, Adam Barth wrote: Personally, I don't have multiple patches in my tree at the same time, so I don't understand what would be the most convenient for you. Removing the update step is easy, but I'm not sure how you would like to specify the changes to remove from the tree. Good point. One of the many things I like about svn-unapply is the excellent speed. It doesn’t have to look at the entire source tree, just unapply the patch. I can imagine getting that same experience from unapply-from-attachment, but it would be inconvenient to have to find and type in the bug number. We could add an unapply-from-attachment command, but that would involve fetching the patch from bugs.webkit.org again... Another option is that the upload command could store a copy of the patch locally that you could then use with svn-apply and svn-unapply directly. To replicate my old workflow I’d need something that would keep local copies of various patches I’m working on, or at least keep track of what they are so I don’t have to remember patch or bug numbers. Before I’d just make patches with svn-create-patch, give them names to help me remember what I was doing, then apply and unapply them, revising as needed, and attaching to bugs as needed. The copies attached to the bugs also had the same descriptive names, so if I downloaded them on another computer I could replicate the same good situation. Again, I’m aware that git users have entirely different ways of accomplishing the same thing and more. It’s not obvious to me how to take a tool primarily designed for the git users and make it great for me, although it seems tantalizingly close. -- Darin ___ webkit-dev mailing list webkit-dev@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-dev
Re: [webkit-dev] What is the webkit-patch version of svn-unapply?
On May 19, 2010, at 11:22 AM, Jeremy Orlow wrote: What if we added an option to webkit-patch upload that unapplies the patch at the end? In fact, for the first iteration, it could simply save the patch in some temporary location and then run 'svn-unapply'. In other words, do what you just described but without the second webkit-patch run. Thanks for the suggestion. Might be handy if I had the foresight to use the option, but would be frustrating if I just uploaded a patch and realized only afterward that was what I wanted. -- Darin ___ webkit-dev mailing list webkit-dev@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-dev
Re: [webkit-dev] What is the webkit-patch version of svn-unapply?
On Wed, May 19, 2010 at 11:15 AM, Adam Barth aba...@webkit.org wrote: We could add an unapply-from-attachment command, but that would involve fetching the patch from bugs.webkit.org again... Another option is that the upload command could store a copy of the patch locally that you could then use with svn-apply and svn-unapply directly. Either of these would probably suffice. (I speak as a frequent user of svn-unapply.) PK ___ webkit-dev mailing list webkit-dev@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-dev
Re: [webkit-dev] What is the webkit-patch version of svn-unapply?
On Wed, May 19, 2010 at 11:25 AM, Darin Adler da...@apple.com wrote: It’s not obvious to me how to take a tool primarily designed for the git users and make it great for me, although it seems tantalizingly close. :) It's funny how the git users also tell me that the tool doesn't fit their workflow. I think different folks just use different workflows. I'll try to solve the problems you're having. Thanks for letting me know. Adam ___ webkit-dev mailing list webkit-dev@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-dev
Re: [webkit-dev] What is the webkit-patch version of svn-unapply?
On May 19, 2010, at 2:05 PM, Chris Jerdonek wrote: I've always wondered the extent to which svn-unapply works for people. It works well for me most of the time. I have some vague memories of recent problems with removed and added files. I’ll try to pay closer attention now. -- Darin ___ webkit-dev mailing list webkit-dev@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-dev
