[Webkit-unassigned] [Bug 33336] webkit-patch rollout should be able to do multi-revision rollouts

[bugzilla-daemon at webkit.org]

https://bugs.webkit.org/show_bug.cgi?id=33336





--- Comment #4 from Gabor Rapcsanyi <rgabor at inf.u-szeged.hu>  2010-11-24 05:20:18 PST ---
(In reply to comment #3)
> (From update of attachment 74544 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=74544&action=review
> 
> We should have Eric look at this patch.  He's on vacation at the moment, so that might take a week.
> 

Ok, than wait him :)

> > WebKitTools/Scripts/webkitpy/common/checkout/scm.py:534
> > +    def apply_reverse_diff(self, revision_list):
> > +        for revision in revision_list:
> > +            # '-c -revision' applies the inverse diff of 'revision'
> > +            svn_merge_args = ['svn', 'merge', '--non-interactive', '-c', '-%s' % revision, self._repository_url()]
> > +            log("WARNING: svn merge has been known to take more than 10 minutes to complete.  It is recommended you use git for rollouts.")
> > +            log("Running '%s'" % " ".join(svn_merge_args))
> > +            # FIXME: Should this use cwd=self.checkout_root?
> > +            self.run(svn_merge_args)
> 
> Have you tested this?  The tricky part here is ChangeLogs.  We might need to deal with the ChangeLog in each iteration of the loop.
> 

Yes I have tested it. As I know we want one ChangeLog for the rolled-out patches and if the patches affect more ChangeLogs we want the same changes in all.

> > WebKitTools/Scripts/webkitpy/tool/commands/download.py:291
> > -    argument_names = "REVISION REASON"
> > +    argument_names = "REVISION(S) REASON"
> 
> This isn't usually how we document multiple arguments.  Check out some of the other commands that take variable arguments for how we do that.

Ok, I will correct this.

-- 
Configure bugmail: https://bugs.webkit.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.