[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Merging backports for review Re: svn commit: r1471504 - /subversion/trunk/tools/dist/backport.pl

From: Daniel Shahaf <danielsh_at_elego.de>
Date: Wed, 24 Apr 2013 20:05:51 +0300

Daniel Shahaf wrote on Wed, Apr 24, 2013 at 19:29:35 +0300:
> danielsh_at_apache.org wrote on Wed, Apr 24, 2013 at 16:14:53 -0000:
> > Author: danielsh
> > Date: Wed Apr 24 16:14:53 2013
> > New Revision: 1471504
> >
> > URL: http://svn.apache.org/r1471504
> > Log:
> > Teach backport.pl to parse non-approved entries, too.
> >
> > * tools/dist/backport.pl
> > (handle_entry): In $YES mode, skip non-approved entries.
> > (main): Parse both approved and non-approved entries, noting which is which.
>
> With this change, backport.pl now supports an interactive workflow that
> covers non-approved entries, too.
>
> You can use it as follows:
>
> % cd trunk-wc
> % svn up tools/dist/backport.pl
> % cd ../18x-wc
> % svn revert -R .
> % ../trunk-wc/tools/dist/backport.pl
> [type 'y' to merge an entry, and 'n' to skip to the next entry]
>
> If you type 'y', it'll run 'revert -R . && update', merge the entry, and
> offer to open a subshell so you can review/build the entry.
>

By popular demand, local mods to the STATUS file will not be reverted.

> The Perl script requires /bin/sh to be available to do merging, so if
> you're on windows you might be able to run the script without errors if
> you answer 'n' to all prompts.
>
> HTH
>
> Daniel
Received on 2013-04-24 19:06:27 CEST

This is an archived mail posted to the Subversion Dev mailing list.