[chromium-dev] Re: Reverting a change, the fast way
On Tue, Nov 3, 2009 at 10:10 PM, Ben Goodger (Google) b...@chromium.org wrote: Can there be a way to apply this to a local tree only so that you can revert then revert the revert quickly locally so you can figure out why your change broke? I know this doesn't answer the question you are asking, but in case other people had the same question I added a section to our Git cookbook on how to do this: http://code.google.com/p/chromium/wiki/GitCookbook#Reverting_and_undoing_reverts --~--~-~--~~~---~--~~ Chromium Developers mailing list: chromium-dev@googlegroups.com View archives, change email options, or unsubscribe: http://groups.google.com/group/chromium-dev -~--~~~~--~~--~--~---
[chromium-dev] Re: Reverting a change, the fast way
Drover is actually an order of magnitude faster than a standard svn merge/reverse, merge since it only affects the files that are involved with the CL (as opposed to trying to descending the entire trunk). A normal merge would take in the space of 8 minutes on my box (which required an existing working copy). In the case of drover, the same merge/revert can be performed in approximately 30 seconds to 1 minute (w/ out a pre existing working copy). Kind Regards, Anthony Laforge Technical Program Manager Mountain View, CA On Tue, Nov 3, 2009 at 2:01 PM, Eric Seidel esei...@chromium.org wrote: Interesting. WebKit has similar functionality as: bugzilla-tool rollout 12345 We've found that git reverts are at least an order of magnitude faster than SVN reverse merges. I wonder what bugzilla-tool/drover can learn from one another. -eric On Tue, Nov 3, 2009 at 1:53 PM, Nicolas Sylvain nsylv...@chromium.org wrote: Hi One of the goal of the Green Tree Task Force was to make reverting a change easy and fast. This is really important to keep the tree green and open. The old saying is Revert now, think later... If a change broke the build and the fix would take more than 1 or 2 minutes to be committed, or if the committer is not answering pings, then the change needs to be reverted asap. Turns out it was already easy and fast with Anthony's drover tool. If you have depot_tools in your path, just type : drover --revert where is the revision you want to revert. Since the tool creates temporary files, I suggest you go to the temp directory first. It should take only a few seconds, even for a really big change. You don't even need to have a chrome checkout on your machine. This tool should work on all platforms. You need svn 1.5 or above in your path. If you run into any issues with the tool, please let me know. Thank you, Nicolas If the tool does not work, you can revert the long way by doing: cd src/ svn update svn merge -c - . (the dot at the end of the previous line is important) --~--~-~--~~~---~--~~ Chromium Developers mailing list: chromium-dev@googlegroups.com View archives, change email options, or unsubscribe: http://groups.google.com/group/chromium-dev -~--~~~~--~~--~--~---
[chromium-dev] Re: Reverting a change, the fast way
Interesting. WebKit has similar functionality as: bugzilla-tool rollout 12345 We've found that git reverts are at least an order of magnitude faster than SVN reverse merges. I wonder what bugzilla-tool/drover can learn from one another. -eric On Tue, Nov 3, 2009 at 1:53 PM, Nicolas Sylvain nsylv...@chromium.org wrote: Hi One of the goal of the Green Tree Task Force was to make reverting a change easy and fast. This is really important to keep the tree green and open. The old saying is Revert now, think later... If a change broke the build and the fix would take more than 1 or 2 minutes to be committed, or if the committer is not answering pings, then the change needs to be reverted asap. Turns out it was already easy and fast with Anthony's drover tool. If you have depot_tools in your path, just type : drover --revert where is the revision you want to revert. Since the tool creates temporary files, I suggest you go to the temp directory first. It should take only a few seconds, even for a really big change. You don't even need to have a chrome checkout on your machine. This tool should work on all platforms. You need svn 1.5 or above in your path. If you run into any issues with the tool, please let me know. Thank you, Nicolas If the tool does not work, you can revert the long way by doing: cd src/ svn update svn merge -c - . (the dot at the end of the previous line is important) --~--~-~--~~~---~--~~ Chromium Developers mailing list: chromium-dev@googlegroups.com View archives, change email options, or unsubscribe: http://groups.google.com/group/chromium-dev -~--~~~~--~~--~--~---
[chromium-dev] Re: Reverting a change, the fast way
I tried that a few days ago, and drover died with me with something along the lines of Can't talk to chrome-svn (which as far as I understand is some internal svn repo?). A quick glance at the source confirms that this is still the case. On Tue, Nov 3, 2009 at 1:53 PM, Nicolas Sylvain nsylv...@chromium.org wrote: Hi One of the goal of the Green Tree Task Force was to make reverting a change easy and fast. This is really important to keep the tree green and open. The old saying is Revert now, think later... If a change broke the build and the fix would take more than 1 or 2 minutes to be committed, or if the committer is not answering pings, then the change needs to be reverted asap. Turns out it was already easy and fast with Anthony's drover tool. If you have depot_tools in your path, just type : drover --revert where is the revision you want to revert. Since the tool creates temporary files, I suggest you go to the temp directory first. It should take only a few seconds, even for a really big change. You don't even need to have a chrome checkout on your machine. This tool should work on all platforms. You need svn 1.5 or above in your path. If you run into any issues with the tool, please let me know. Thank you, Nicolas If the tool does not work, you can revert the long way by doing: cd src/ svn update svn merge -c - . (the dot at the end of the previous line is important) --~--~-~--~~~---~--~~ Chromium Developers mailing list: chromium-dev@googlegroups.com View archives, change email options, or unsubscribe: http://groups.google.com/group/chromium-dev -~--~~~~--~~--~--~---
[chromium-dev] Re: Reverting a change, the fast way
On Tue, Nov 3, 2009 at 3:01 PM, Nico Weber tha...@chromium.org wrote: I tried that a few days ago, and drover died with me with something along the lines of Can't talk to chrome-svn (which as far as I understand is some internal svn repo?). A quick glance at the source confirms that this is still the case. Good point, it should have a way to specify which url it should use to checkout from. by default it uses the internal url. I'll try to find a way to fix that. Nicolas On Tue, Nov 3, 2009 at 1:53 PM, Nicolas Sylvain nsylv...@chromium.org wrote: Hi One of the goal of the Green Tree Task Force was to make reverting a change easy and fast. This is really important to keep the tree green and open. The old saying is Revert now, think later... If a change broke the build and the fix would take more than 1 or 2 minutes to be committed, or if the committer is not answering pings, then the change needs to be reverted asap. Turns out it was already easy and fast with Anthony's drover tool. If you have depot_tools in your path, just type : drover --revert where is the revision you want to revert. Since the tool creates temporary files, I suggest you go to the temp directory first. It should take only a few seconds, even for a really big change. You don't even need to have a chrome checkout on your machine. This tool should work on all platforms. You need svn 1.5 or above in your path. If you run into any issues with the tool, please let me know. Thank you, Nicolas If the tool does not work, you can revert the long way by doing: cd src/ svn update svn merge -c - . (the dot at the end of the previous line is important) --~--~-~--~~~---~--~~ Chromium Developers mailing list: chromium-dev@googlegroups.com View archives, change email options, or unsubscribe: http://groups.google.com/group/chromium-dev -~--~~~~--~~--~--~---
[chromium-dev] Re: Reverting a change, the fast way
Yeah, does anyone know why SVN does that? It seems like it could easily inspect the revision to see what files changed, and then only merge those files :-/ depot_tools/revert also works this way. Should we remove depot_tools/revert, or re-implement it on top of drover? -Darin On Tue, Nov 3, 2009 at 4:34 PM, Anthony LaForge lafo...@google.com wrote: Drover is actually an order of magnitude faster than a standard svn merge/reverse, merge since it only affects the files that are involved with the CL (as opposed to trying to descending the entire trunk). A normal merge would take in the space of 8 minutes on my box (which required an existing working copy). In the case of drover, the same merge/revert can be performed in approximately 30 seconds to 1 minute (w/ out a pre existing working copy). Kind Regards, Anthony Laforge Technical Program Manager Mountain View, CA On Tue, Nov 3, 2009 at 2:01 PM, Eric Seidel esei...@chromium.org wrote: Interesting. WebKit has similar functionality as: bugzilla-tool rollout 12345 We've found that git reverts are at least an order of magnitude faster than SVN reverse merges. I wonder what bugzilla-tool/drover can learn from one another. -eric On Tue, Nov 3, 2009 at 1:53 PM, Nicolas Sylvain nsylv...@chromium.org wrote: Hi One of the goal of the Green Tree Task Force was to make reverting a change easy and fast. This is really important to keep the tree green and open. The old saying is Revert now, think later... If a change broke the build and the fix would take more than 1 or 2 minutes to be committed, or if the committer is not answering pings, then the change needs to be reverted asap. Turns out it was already easy and fast with Anthony's drover tool. If you have depot_tools in your path, just type : drover --revert where is the revision you want to revert. Since the tool creates temporary files, I suggest you go to the temp directory first. It should take only a few seconds, even for a really big change. You don't even need to have a chrome checkout on your machine. This tool should work on all platforms. You need svn 1.5 or above in your path. If you run into any issues with the tool, please let me know. Thank you, Nicolas If the tool does not work, you can revert the long way by doing: cd src/ svn update svn merge -c - . (the dot at the end of the previous line is important) --~--~-~--~~~---~--~~ Chromium Developers mailing list: chromium-dev@googlegroups.com View archives, change email options, or unsubscribe: http://groups.google.com/group/chromium-dev -~--~~~~--~~--~--~---
