Lieven, did this just magically fix itself or something?
http://www.mobsol.be/buildbot/x86-macosx-gnu shared/builds/3567
http://www.mobsol.be/buildbot/x86-macosx-gnu shared/builds/3568
3567 fails. 3568 passes and the only changes are to ra_serf and CHANGES.
(... or does this indicate some problem with the buildbot where the
server build lags the client or something?)
--dave
On Nov 24, 2007 6:40 PM, David Glasser <glasser@davidglasser.net> wrote:
>
> On Nov 24, 2007 7:23 AM, Lieven Govaerts <svnlgo@mobsol.be> wrote:
> > glasser@tigris.org wrote:
> > > Author: glasser
> > > Date: Fri Nov 23 10:02:00 2007
> > > New Revision: 27991
> > >
> > > Log:
> > > Backport:
> > >
> > > * r21406-21407, r21540
> > > Fix issue #2608: Can set directory props on the root of an FSFS
> > > filesystem from an out-of-date repository.
> > > Justification:
> > > Minor data loss bug. Has been in trunk for a year (so probably
> > > safe). Now reported by a user
> > > (http://svn.haxx.se/dev/archive-2007-09/0441.shtml). Has unit
> > > and end-to-end tests.
> > > Branch: 1.4.x-issue-2608 (resolving a trivial conflict and removing
> > > an irrelevant helper function)
> > > Votes:
> > > +1: glasser, dlr, hwright
> > >
> > ..
> >
> >
> >
> > > Modified: branches/1.4.x/subversion/tests/cmdline/prop_tests.py
> > > URL: http://svn.collab.net/viewvc/svn/branches/1.4.x/subversion/tests/cmdline/prop_tests.py?pathrev=27991&r1=27990&r2=27991
> > > ==============================================================================
> > > --- branches/1.4.x/subversion/tests/cmdline/prop_tests.py (original)
> > > +++ branches/1.4.x/subversion/tests/cmdline/prop_tests.py Fri Nov 23 10:02:00 2007
> > > @@ -355,6 +355,33 @@
> > > svntest.actions.run_and_verify_status(wc_dir, expected_status)
> > >
> > > #----------------------------------------------------------------------
> > > +def commit_conflict_dirprops(sbox):
> > > + "commit with conflicting dirprops"
> > > +
> > > + # Issue #2608: failure to see conflicting dirprops on root of
> > > + # repository.
> > > +
> > > + # Bootstrap
> > > + sbox.build()
> > > + wc_dir = sbox.wc_dir
> > > +
> > > + svntest.main.run_svn(None, 'propset', 'foo', 'bar', wc_dir)
> > > +
> > > + # Commit the file and directory
> > > + svntest.main.run_svn(None, 'ci', '-m', 'r2', wc_dir)
> > > +
> > > + # Update to rev 1
> > > + svntest.main.run_svn(None, 'up', '-r', '1', wc_dir)
> > > +
> > > + # Add conflicting properties
> > > + svntest.main.run_svn(None, 'propset', 'foo', 'eek', wc_dir)
> > > +
> > > + svntest.actions.run_and_verify_commit(wc_dir, None, None,
> > > + "Out of date: '' in transaction",
> > > + None, None, None, None,
> > > + wc_dir)
> > > +
> > > +#----------------------------------------------------------------------
> > >
> > > # Issue #742: we used to screw up when committing a file replacement
> > > # that also had properties. It was fixed by teaching
> > > @@ -1171,6 +1198,7 @@
> > > downdate_props,
> > > remove_props,
> > > update_conflict_props,
> > > + commit_conflict_dirprops,
> > > commit_replacement_props,
> > > revert_replacement_props,
> > > inappropriate_props,
> >
> > This test is failing on the Mac buildslave over ra_neon:
> > http://www.mobsol.be/buildbot/x86-macosx-gnu%20shared/builds/3567
> > (see links stdio and tests_log).
>
> I won't be able to debug this until Monday; I suspect it is literally
> just a not-liberal-enough regexp or something.
>
> --dave
>
>
>
> --
> David Glasser | glasser_at_davidglasser.net | http://www.davidglasser.net/
>
--
David Glasser | glasser_at_davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Nov 26 15:43:59 2007