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

Re: commits made directly to 1.5.x

From: Jens Seidel <jensseidel_at_users.sourceforge.net>
Date: Thu, 29 May 2008 21:18:35 +0200

On Thu, May 29, 2008 at 09:16:39PM +0300, Daniel Shahaf wrote:
> Lieven Govaerts wrote on Thu, 29 May 2008 at 20:01 +0200:
> > Stefan Sperling wrote:
> > > On Wed, May 28, 2008 at 05:58:14PM -0400, Mark Phippard wrote:
> > >
> > >> On Wed, May 28, 2008 at 5:22 PM, Lieven Govaerts <svnlgo_at_mobsol.be> wrote:
> > >>
> > >>> As simple as this change might be, it breaks one of the getopt tests. The getopt tests are one of the only tests really matching the actual
> > >>> string content character per character. I know these tests are overly strict, but while we have them I propose you run at least those
> > >>> before you commit a text change inside the code.
> > >>>
> > >> And as you said in the other email, why are we doing direct commits to
> > >> the branch, without going through STATUS or even a dev@ email, right
> > >> before we are about to make the release?
> > >>
> > >
> > > Shouldn't we immediately back out r31503 and r31506, both of which were
> > > directly committed to 1.5.x without being voted for in STATUS?

Great! If you would revert r31506 you would add a regression because of
r31501.

> > While I don't think r31503 and r31506 were urgent 1.5.x material, they
> > don't do much harm either. They're included in RC8 now, so the cost of
> > rolling them back (ie; RC9) will be bigger than the benefit.
> >
>
> We can include them in 1.5.1, as they only change the 'svn --help'
> output. No rc9.

That's wrong again! These patches just manually expand macros in help
outputs (for commands resolve, mergeinfo and switch). There should be
no change in the output!

The problem was that xgettext, a tool to extract messages from source
code to put it into a .pot translation template file, failed to parse
these strings containing macros. This resulted in no such messages
in the translation PO files (and were that's why not translated) which I
fixed by manually inserting these messages.
Without macros xgettext works well and even after the next po-update.py
call PO files no messages will be missing.

> > Let's just avoid this situation in the future.

Right! Don't revert it! It was carefully proven by me and others!

Jens

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-05-29 21:21:02 CEST

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