You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Mark Phippard <ma...@gmail.com> on 2008/05/24 14:55:50 UTC

SVN 1.5 cleared for takeoff

STATUS is pretty much cleared.  There is just one doc fix with 2 votes
that I think could possibly have just been committed without voting.
Not sure if we ever do that for a release branch.

Looks like we are good to go on making RC6 whenever Hyrum has the
time.  I am running the test suites and will report if I find
anything.  I tested all the bindings yesterday.  Will probably focus
on Serf which I have not tested recently.

-- 
Thanks

Mark Phippard
http://markphip.blogspot.com/

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: SVN 1.5 cleared for takeoff

Posted by Arfrever Frehtes Taifersar Arahesis <ar...@gmail.com>.
2008-05-24 18:20:15 Karl Fogel napisaƂ(a):
> "Mark Phippard" <ma...@gmail.com> writes:
> > STATUS is pretty much cleared.  There is just one doc fix with 2 votes
> > that I think could possibly have just been committed without voting.
> > Not sure if we ever do that for a release branch.
> 
> To my surprise, hacking.html says doc string changes need regular
> voting.  I think that's silly and that we should change it to
> one-vote-required -- that is, proposing it for backport is sufficient to
> get it merged.

+1

-- 
Arfrever Frehtes Taifersar Arahesis

Re: SVN 1.5 cleared for takeoff

Posted by "Hyrum K. Wright" <hy...@mail.utexas.edu>.
Karl Fogel wrote:
> "Mark Phippard" <ma...@gmail.com> writes:
>> STATUS is pretty much cleared.  There is just one doc fix with 2 votes
>> that I think could possibly have just been committed without voting.
>> Not sure if we ever do that for a release branch.
> 
> To my surprise, hacking.html says doc string changes need regular
> voting.  I think that's silly and that we should change it to
> one-vote-required -- that is, proposing it for backport is sufficient to
> get it merged.

+1

-Hyrum


Re: SVN 1.5 cleared for takeoff

Posted by Karl Fogel <kf...@red-bean.com>.
"Mark Phippard" <ma...@gmail.com> writes:
> STATUS is pretty much cleared.  There is just one doc fix with 2 votes
> that I think could possibly have just been committed without voting.
> Not sure if we ever do that for a release branch.

To my surprise, hacking.html says doc string changes need regular
voting.  I think that's silly and that we should change it to
one-vote-required -- that is, proposing it for backport is sufficient to
get it merged.

I mean, how often has a doc string fix made a doc string worse?  I can
see how such a change might not be as good as it could be, but it's
extremely rare for it to be a regression.

-Karl

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: SVN 1.5 cleared for takeoff

Posted by "Hyrum K. Wright" <hy...@mail.utexas.edu>.
Mark Phippard wrote:
> STATUS is pretty much cleared.  There is just one doc fix with 2 votes
> that I think could possibly have just been committed without voting.
> Not sure if we ever do that for a release branch.
> 
> Looks like we are good to go on making RC6 whenever Hyrum has the
> time.  I am running the test suites and will report if I find
> anything.  I tested all the bindings yesterday.  Will probably focus
> on Serf which I have not tested recently.

There's one last thing: sync'ing CHANGES with trunk.

I'll do it sometime today, and then roll the tarball.

-Hyrum


Re: SVN 1.5 cleared for takeoff

Posted by Karl Fogel <kf...@red-bean.com>.
Karl Fogel <kf...@red-bean.com> writes:
> Marc Strapetz <ma...@syntevo.com> writes:
>> I would really hope that
>>
>> * r31059, 31060, 31061, 31075, 31151
>>   Fix issue #3157, Merging a change from a path's natural history
>>   creates self-referential mergeinfo
>>
>> [...]
>  [...]
>
> Remember that we can't guarantee that merge-tracking doesn't have some
> other bug anyway: it's not like including the above fixes and releasing
> means we're home free.  In the long run, it's better to inspect the
> changes and truly understand that they are correct, than to ship them
> thinking a bug is fixed when in fact it might be broken in some more
> subtle way.

...for example, see r31482 :-).

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: SVN 1.5 cleared for takeoff

Posted by Paul Burba <pt...@gmail.com>.
On Wed, May 28, 2008 at 1:47 PM, Marc Strapetz
<ma...@syntevo.com> wrote:
>> It's possible that your understanding of this bug is deeper than mine.
>> Would you be willing to try writing that text... ?
>
> I will gladly formulate the problem, but regarding the resolution I'm also
> not sure -- maybe someone with more insight into merge-tracking can comment
> on the description below, assuming following repository:
>
> - trunk created from initial import at r1
> - trunk/file modified at r2
> - branches created at r3
> - branches/branch created at r4 (from trunk at r2)
> - branches/branch/file modified at r5
> - branches/branch/file modified at r6
>
> A merge from branch to trunk currently results in an svn:mergeinfo of:
>
> /branches/branch:4-6
> /trunk:2-3
>
> "/trunk:2-3" is a self-referential mergeinfo which should (and for 1.5.1
> actually will) be omitted. So the correct svn:mergeinfo would just be:
>
> /branches/branch:4-6

Hi Marc,

FWIW, in your example you could use a reintegrate merge and only
'/branches/branch:4-6' is set for mergeinfo on trunk.  So that is a
good workaround for this particular example:

1.5.0.RC8>svn pl -vR

1.5.0.RC8>svn merge %MURL%/branches/branch trunk --reintegrate
--- Merging differences between repository URLs into 'trunk':
U    trunk\file

1.5.0.RC8>svn pl -vR
Properties on 'trunk':
  svn:mergeinfo : /branches/branch:4-6

> This can either be achieved by "reverse merging" the trunk changes with
> --record-only

That would work fine:

1.5.0.RC8>svn pl -vR
Properties on 'trunk':
  svn:mergeinfo : /branches/branch:4-6
/trunk:2-3

1.5.0.RC8>svn merge %MURL%/trunk trunk -r3:1 --record-only

1.5.0.RC8>svn pl -vR
Properties on 'trunk':
  svn:mergeinfo : /branches/branch:4-6

> or -- more brute force -- by manually editing the
> svn:mergeinfo property.

In general I'd advise against manually editing the svn:mergeinfo prop
unless you absolutely can't 'fix' the mergeinfo using svn merge.  (And
if you find examples where you can't do what you want with svn merge
please let us know!).

> So for this very basic case, is this actually the manual fix for issue
> #3157?

Yes, removing explicit mergeinfo that describes natural history from
the *ROOT OF A BRANCH * doesn't have any ill effect that I can see.
In fact, other than with log -g, it shouldn't have *any* effect.

I am concerned about a few things though:

1) That in more complex examples determining the implicit mergeinfo
(i.e. the natural history) to remove may prove less obvious.

2) Once we have subtrees with explicit mergeinfo, if we manually
filter natural history and invalid path/revs from these, then:

2A) Elision won't work any more (at least as it's implemented today).
This is what I was getting at in
http://subversion.tigris.org/issues/show_bug.cgi?id=3157#desc8.  That
may not be a big problem for users with subtree mergeinfo, they
probably have that subtree mergeinfo for a reason (e.g. they do
nothing but file merges).

2B) There may be other ill effects with subtree merges.  The way the
merge editor is driven is fairly complicated when it comes to dealing
with subtrees with explicit mergeinfo, look no further than issue
#3067.  I don't see a specific problem right now, but I'm not
comfortable recommending subtree mergeinfo tweaks as a matter of
policy quite yet.

Paul

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: SVN 1.5 cleared for takeoff

Posted by David Glasser <gl...@davidglasser.net>.
On Wed, May 28, 2008 at 10:47 AM, Marc Strapetz
<ma...@syntevo.com> wrote:
>> It's possible that your understanding of this bug is deeper than mine.
>> Would you be willing to try writing that text... ?
>
> I will gladly formulate the problem, but regarding the resolution I'm also
> not sure -- maybe someone with more insight into merge-tracking can comment
> on the description below, assuming following repository:
>
> - trunk created from initial import at r1
> - trunk/file modified at r2
> - branches created at r3
> - branches/branch created at r4 (from trunk at r2)
> - branches/branch/file modified at r5
> - branches/branch/file modified at r6
>
> A merge from branch to trunk currently results in an svn:mergeinfo of:
>
> /branches/branch:4-6
> /trunk:2-3
>
> "/trunk:2-3" is a self-referential mergeinfo which should (and for 1.5.1
> actually will) be omitted. So the correct svn:mergeinfo would just be:
>
> /branches/branch:4-6
>
> This can either be achieved by "reverse merging" the trunk changes with
> --record-only or -- more brute force -- by manually editing the
> svn:mergeinfo property.
>
> So for this very basic case, is this actually the manual fix for issue
> #3157?

So far you've described the value of a property (both what it is, and
what you would consider "correct").  You haven't actually explained
how this is a problem, though.  (I'm not saying it isn't: I'm just
saying it's not self-evident.)

--dave

-- 
David Glasser | glasser@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

Re: SVN 1.5 cleared for takeoff

Posted by Marc Strapetz <ma...@syntevo.com>.
> It's possible that your understanding of this bug is deeper than mine.
 > Would you be willing to try writing that text... ?

I will gladly formulate the problem, but regarding the resolution I'm 
also not sure -- maybe someone with more insight into merge-tracking can 
comment on the description below, assuming following repository:

- trunk created from initial import at r1
- trunk/file modified at r2
- branches created at r3
- branches/branch created at r4 (from trunk at r2)
- branches/branch/file modified at r5
- branches/branch/file modified at r6

A merge from branch to trunk currently results in an svn:mergeinfo of:

/branches/branch:4-6
/trunk:2-3

"/trunk:2-3" is a self-referential mergeinfo which should (and for 1.5.1 
actually will) be omitted. So the correct svn:mergeinfo would just be:

/branches/branch:4-6

This can either be achieved by "reverse merging" the trunk changes with 
--record-only or -- more brute force -- by manually editing the 
svn:mergeinfo property.

So for this very basic case, is this actually the manual fix for issue 
#3157?

--
Best regards,
Marc Strapetz
_____________
SyntEvo GmbH
www.syntevo.com



Karl Fogel wrote:
> Marc Strapetz <ma...@syntevo.com> writes:
>>> We should mention this problem in the Release Notes, of course, and say
>>> that it will be fixed in 1.5.1.
>> It would be helpful here to give some additional information on how it
>> would be right (i.e. how it will be changed for 1.5.1) so that fussy
>> people like me can fix it manually when committing a merged revision
>> :)
> 
> It's possible that your understanding of this bug is deeper than mine.
> Would you be willing to try writing that text... ?  If you can, I'll
> make sure it gets into the Release Notes, or into some document linked
> to from the appropriate place in the Release Notes.
> 
> -Karl
> 
> 

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: SVN 1.5 cleared for takeoff

Posted by Karl Fogel <kf...@red-bean.com>.
Marc Strapetz <ma...@syntevo.com> writes:
>> We should mention this problem in the Release Notes, of course, and say
>> that it will be fixed in 1.5.1.
>
> It would be helpful here to give some additional information on how it
> would be right (i.e. how it will be changed for 1.5.1) so that fussy
> people like me can fix it manually when committing a merged revision
> :)

It's possible that your understanding of this bug is deeper than mine.
Would you be willing to try writing that text... ?  If you can, I'll
make sure it gets into the Release Notes, or into some document linked
to from the appropriate place in the Release Notes.

-Karl

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: SVN 1.5 cleared for takeoff

Posted by Marc Strapetz <ma...@syntevo.com>.
> We should mention this problem in the Release Notes, of course, and say
> that it will be fixed in 1.5.1.

It would be helpful here to give some additional information on how it 
would be right (i.e. how it will be changed for 1.5.1) so that fussy 
people like me can fix it manually when committing a merged revision :)

--
Best regards,
Marc Strapetz
_____________
SyntEvo GmbH
www.syntevo.com



Karl Fogel wrote:
> Marc Strapetz <ma...@syntevo.com> writes:
>> I would really hope that
>>
>> * r31059, 31060, 31061, 31075, 31151
>>   Fix issue #3157, Merging a change from a path's natural history
>>   creates self-referential mergeinfo
>>
>> will still be included for 1.5.0. The simple reason is that the
>> addressed problem introduces *irreversible* repository
>> inconsistencies. I'm stumbling across this quite frequently for our
>> production repository which we have already switched to RC5. It makes
>> even short logs quite lengthy and confusing.
>>
>> As far as I understand there is consensus on that the self-referential
>> mergeinfo is not correct? In that case I think the risk that this fix
>> breaks something even *more* severe than this problem itself is quite
>> low.
> 
> It's a judgement call, but I think we need to ship 1.5.0 at this point,
> as it has many things besides merge-tracking.
> 
> Remember that we can't guarantee that merge-tracking doesn't have some
> other bug anyway: it's not like including the above fixes and releasing
> means we're home free.  In the long run, it's better to inspect the
> changes and truly understand that they are correct, than to ship them
> thinking a bug is fixed when in fact it might be broken in some more
> subtle way.
> 
> We should mention this problem in the Release Notes, of course, and say
> that it will be fixed in 1.5.1.
> 
> -Karl
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
> 
> 

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: SVN 1.5 cleared for takeoff

Posted by Karl Fogel <kf...@red-bean.com>.
Marc Strapetz <ma...@syntevo.com> writes:
> I would really hope that
>
> * r31059, 31060, 31061, 31075, 31151
>   Fix issue #3157, Merging a change from a path's natural history
>   creates self-referential mergeinfo
>
> will still be included for 1.5.0. The simple reason is that the
> addressed problem introduces *irreversible* repository
> inconsistencies. I'm stumbling across this quite frequently for our
> production repository which we have already switched to RC5. It makes
> even short logs quite lengthy and confusing.
>
> As far as I understand there is consensus on that the self-referential
> mergeinfo is not correct? In that case I think the risk that this fix
> breaks something even *more* severe than this problem itself is quite
> low.

It's a judgement call, but I think we need to ship 1.5.0 at this point,
as it has many things besides merge-tracking.

Remember that we can't guarantee that merge-tracking doesn't have some
other bug anyway: it's not like including the above fixes and releasing
means we're home free.  In the long run, it's better to inspect the
changes and truly understand that they are correct, than to ship them
thinking a bug is fixed when in fact it might be broken in some more
subtle way.

We should mention this problem in the Release Notes, of course, and say
that it will be fixed in 1.5.1.

-Karl

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: SVN 1.5 cleared for takeoff

Posted by Marc Strapetz <ma...@syntevo.com>.
I would really hope that

* r31059, 31060, 31061, 31075, 31151
   Fix issue #3157, Merging a change from a path's natural history
   creates self-referential mergeinfo

will still be included for 1.5.0. The simple reason is that the 
addressed problem introduces *irreversible* repository inconsistencies. 
I'm stumbling across this quite frequently for our production repository 
which we have already switched to RC5. It makes even short logs quite 
lengthy and confusing.

As far as I understand there is consensus on that the self-referential 
mergeinfo is not correct? In that case I think the risk that this fix 
breaks something even *more* severe than this problem itself is quite low.

--
Best regards,
Marc Strapetz
_____________
SyntEvo GmbH
www.syntevo.com



Mark Phippard wrote:
> STATUS is pretty much cleared.  There is just one doc fix with 2 votes
> that I think could possibly have just been committed without voting.
> Not sure if we ever do that for a release branch.
> 
> Looks like we are good to go on making RC6 whenever Hyrum has the
> time.  I am running the test suites and will report if I find
> anything.  I tested all the bindings yesterday.  Will probably focus
> on Serf which I have not tested recently.
> 

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: SVN 1.5 cleared for takeoff

Posted by Mark Phippard <ma...@gmail.com>.
On Sat, May 24, 2008 at 10:55 AM, Mark Phippard <ma...@gmail.com> wrote:
> STATUS is pretty much cleared.  There is just one doc fix with 2 votes
> that I think could possibly have just been committed without voting.
> Not sure if we ever do that for a release branch.
>
> Looks like we are good to go on making RC6 whenever Hyrum has the
> time.  I am running the test suites and will report if I find
> anything.  I tested all the bindings yesterday.  Will probably focus
> on Serf which I have not tested recently.

I am seeing Serf test failures.  It would be good if someone else
could confirm.  Seems to be tests where things do not exist.  Which
leads me to believe it must be related to this backport:

r31357 | cmpilato | 2008-05-22 10:46:45 -0400 (Thu, 22 May 2008) | 16 lines

Merge from trunk this change group:

 * r31313
   Make all ra layers return a consistent error when a path is not found in the
   repository.
   Notes:
     Small change, but API consistency is always a good thing.
     Does not merge cleanly!
   Votes:
     +1: lgo, epg, cmpilato

I know Lieven made this change, so it is kind of hard to believe it
breaks Serf tests since he has been doing most of the Serf work
lately.  Perhaps my working copy needs to be cleaned or something.  It
would be good if someone could confirm these test failures.

Here are some examples of failures:

SVNProcessTerminatedBySignal
Traceback (most recent call last):
  File "/Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/svntest/main.py",
line 1078, in run
    rc = apply(self.pred.run, (), kw)
  File "/Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/svntest/testcase.py",
line 121, in run
    return self.func(sandbox)
  File "/Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/basic_tests.py",
line 254, in basic_mkdir_url_with_parents
    X_Y_Z_url, X_Y_Z2_url, X_T_C_url, U_V_url)
  File "/Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/svntest/actions.py",
line 175, in run_and_verify_svn
    out, err = main.run_svn(want_err, *varargs)
  File "/Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/svntest/main.py",
line 494, in run_svn
    *(_with_auth(_with_config_dir(varargs))))
  File "/Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/svntest/main.py",
line 313, in run_command
    None, *varargs)
  File "/Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/svntest/main.py",
line 427, in run_command_stdin
    *varargs)
  File "/Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/svntest/main.py",
line 407, in spawn_process
    exit_code = wait_on_pipe(kid, stdout_lines, stderr_lines)
  File "/Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/svntest/main.py",
line 374, in wait_on_pipe
    raise SVNProcessTerminatedBySignal
SVNProcessTerminatedBySignal
FAIL:  basic_tests.py 6: basic mkdir URL, including parent directories

CMD: svn co -r 1
http://localhost:33032/svn-test-work/repositories/basic_tests-15/A/D@1
svn-test-work/working_copies/basic_tests-15/new_D --config-dir
/Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/svn-test-work/local_tmp/config
--password rayjandom --no-auth-cache --username jrandom <TIME =
0.068610>
subversion/libsvn_ra_serf/util.c:1446: (apr_err=160013)
svn: '/svn-test-work/repositories/basic_tests-15/A/D' path not found
Traceback (most recent call last):
  File "/Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/svntest/main.py",
line 1078, in run
    rc = apply(self.pred.run, (), kw)
  File "/Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/svntest/testcase.py",
line 121, in run
    return self.func(sandbox)
  File "/Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/basic_tests.py",
line 1178, in basic_checkout_deleted
    url + "@1", wc2)
  File "/Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/svntest/actions.py",
line 175, in run_and_verify_svn
    out, err = main.run_svn(want_err, *varargs)
  File "/Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/svntest/main.py",
line 494, in run_svn
    *(_with_auth(_with_config_dir(varargs))))
  File "/Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/svntest/main.py",
line 313, in run_command
    None, *varargs)
  File "/Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/svntest/main.py",
line 435, in run_command_stdin
    raise Failure
Failure
FAIL:  basic_tests.py 15: checkout a path no longer in HEAD

svn: '/svn-test-work/repositories/basic_tests-31/iota' path not found
Traceback (most recent call last):
  File "/Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/svntest/main.py",
line 1078, in run
    rc = apply(self.pred.run, (), kw)
  File "/Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/svntest/testcase.py",
line 121, in run
    return self.func(sandbox)
  File "/Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/basic_tests.py",
line 1711, in info_nonhead
    furl + '@1', '-r1')
  File "/Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/svntest/actions.py",
line 175, in run_and_verify_svn
    out, err = main.run_svn(want_err, *varargs)
  File "/Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/svntest/main.py",
line 494, in run_svn
    *(_with_auth(_with_config_dir(varargs))))
  File "/Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/svntest/main.py",
line 313, in run_command
    None, *varargs)
  File "/Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/svntest/main.py",
line 435, in run_command_stdin
    raise Failure
Failure
FAIL:  basic_tests.py 31: info on file not existing in HEAD


If these are real failures, then I think we should back out this fix
from the branch.

-- 
Thanks

Mark Phippard
http://markphip.blogspot.com/

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org