You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Kamesh Jayachandran <ka...@collab.net> on 2008/01/11 16:30:38 UTC

issue-2897 branch work is complete

Hi All,

I am done with issue-2897 branch work.

I am leaving to community to decide when to merge that back to trunk.

With regards
Kamesh Jayachandran

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

RE: issue-2897 branch work is complete

Posted by Kamesh Jayachandran <ka...@collab.net>.
>The only reason we never saw this on trunk was that none of the tests create mergeinfo with values more than two lines long.

>Anyhow I committed a fix to trunk in r28878.  That will take care of those two failures.

>Paul


Thanks Paul.

With regards
Kamesh Jayachandran

RE: issue-2897 branch work is complete

Posted by Paul Burba <pb...@collab.net>.
 > -----Original Message-----
> From: Kamesh Jayachandran [mailto:kamesh@collab.net] 
> Sent: Friday, January 11, 2008 3:04 PM
> To: Lieven Govaerts
> Cc: dev@subversion.tigris.org
> Subject: RE: issue-2897 branch work is complete
> 
> Thanks Lieven.
> 
> >Windows build:
> 
> >FAIL:  merge_tests.py 78: allow non-reflective changes from 
> reflective 
> >rev
> >FAIL:  merge_tests.py 82: reflective merge on reincarnated target
> 
> Cause of failure seems to be bit strange.
> 
> Expected Properties: {'svn:mergeinfo': 
> '/A/C:5-6,10\n/A/FB1:4-16\n/A/FB2:4-12\n'}
> Actual               {'svn:mergeinfo': 
> '/A/C:5-6,10\n/A/FB1:4-16\r\n/A/FB2:4-12\n'}
> 
> 
> Expected {'svn:mergeinfo': '/A/C:2-3,7,14\n/A/C1:11\n/A/FB:2-15\n'}
> Actual {'svn:mergeinfo': '/A/C:2-3,7,14\n/A/C1:11\r\n/A/FB:2-15\n'}
> 
> 
> See the in between merge source /A/FB1 and /A/C1 have CR character.
> 
> Will investigate.

Hi Kamesh,

Those merge test failures are likely to be a bit tough for you to track
down without a Windows box so I took a look.  The two merge test
failures occur on Windows because:

1) As you know, multiline svn:mergeinfo values are stored in UTF-8 with
LF line endings.  So taking merge test 78 as an example, we have this
propval: "/A/C:5-6,10<LF>/A/FB1:4-16<LF>/A/FB2:4-12"

2) The test suite checks expected properties by calling svn proplist
--verbose which in svn/props.c:svn_cl__print_prop_hash() calls
svn_subst_detranslate_string() on the above propval converting it to
"/A/C:5-6,10<CR><LF>/A/FB1:4-16<CR><LF>/A/FB2:4-12".  Then it calls
printf("  %s : %s\n", pname_stdout, propval->data) which actually
outputs the following to stdout:

Properties on 'merge_tests-78\A\C':<CR><LF>
  svn:mergeinfo : /A/C:5-6,10<CR><CR><LF>
/A/FB1:4-16<CR><CR><LF>
/A/FB2:4-12<CR><LF>

This looks fine on the Win32 console as the <CR>s without <LF>s are
ignored.

3) The real problem is in tests/cmdline/svntest/tree.py:get_props() a
helper involved in building the actual disk tree for comparison to the
expected disk.  In that method the eol marker of the first line of a
multiline prop value is stripped and replaced with <LF> ('\n').  But
then the subsequent lines are left as is as they are appended to the
'props' hash value.  So if the mergeinfo property value has N lines,
line 2 through N-1 will end with <CR><CR><LF> ('\r\n'), which leads to
the failure you are seeing.

The only reason we never saw this on trunk was that none of the tests
create mergeinfo with values more than two lines long.

Anyhow I committed a fix to trunk in r28878.  That will take care of
those two failures.

Paul

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


RE: issue-2897 branch work is complete

Posted by Kamesh Jayachandran <ka...@collab.net>.
Thanks Lieven.



>Windows build:

>FAIL:  merge_tests.py 78: allow non-reflective changes from reflective rev
>FAIL:  merge_tests.py 82: reflective merge on reincarnated target

Cause of failure seems to be bit strange.

Expected Properties: {'svn:mergeinfo': '/A/C:5-6,10\n/A/FB1:4-16\n/A/FB2:4-12\n'}
Actual               {'svn:mergeinfo': '/A/C:5-6,10\n/A/FB1:4-16\r\n/A/FB2:4-12\n'}


Expected {'svn:mergeinfo': '/A/C:2-3,7,14\n/A/C1:11\n/A/FB:2-15\n'}
Actual {'svn:mergeinfo': '/A/C:2-3,7,14\n/A/C1:11\r\n/A/FB:2-15\n'}


See the in between merge source /A/FB1 and /A/C1 have CR character.

Will investigate.



>FAIL:  blame_tests.py 10: test 'svn blame -g'
>FAIL:  blame_tests.py 11: don't look for merged files out of range

Have got quite a strange error, does not seem related to 2897 directly. Will investigate.

>Mac build:

>FAIL:  log_tests.py 17: test 'svn log -g' on a branching revision
>FAIL:  log_tests.py 19: test 'svn log -g' a path added before merge
>FAIL:  blame_tests.py 10: test 'svn blame -g'
>FAIL:  blame_tests.py 11: don't look for merged files out of range


All these MAC errors seem related to r28843. Will look at it.


With regards
Kamesh Jayachandran

Re: issue-2897 branch work is complete

Posted by Lieven Govaerts <sv...@mobsol.be>.
Kamesh Jayachandran wrote:
> Hi All,
> 
> I am done with issue-2897 branch work.
> 
> I am leaving to community to decide when to merge that back to trunk.
> 
> With regards
> Kamesh Jayachandran
> 
Kamesh,

I've triggered build & test for this branch on the windows & mac
buildslaves yesterday, that's ra_local and ra_neon respectively.

Both of them had a small number of failing tests.

Windows build:

FAIL:  merge_tests.py 78: allow non-reflective changes from reflective rev
FAIL:  merge_tests.py 82: reflective merge on reincarnated target
FAIL:  blame_tests.py 10: test 'svn blame -g'
FAIL:  blame_tests.py 11: don't look for merged files out of range

stdout:
http://www.mobsol.be/buildbot/win32-xp%20VS2005/builds/3055/step-Test%20fsfs%2Bra_local/1
test.log:
http://www.mobsol.be/buildbot/win32-xp%20VS2005/builds/3055/step-Test%20fsfs%2Bra_local/0


Mac build:

FAIL:  log_tests.py 17: test 'svn log -g' on a branching revision
FAIL:  log_tests.py 19: test 'svn log -g' a path added before merge
FAIL:  blame_tests.py 10: test 'svn blame -g'
FAIL:  blame_tests.py 11: don't look for merged files out of range

stdout:
http://www.mobsol.be/buildbot/x86-macosx-gnu%20shared/builds/3789/step-Test%20fsfs%2Bra_neon/1
test.log:
http://www.mobsol.be/buildbot/x86-macosx-gnu%20shared/builds/3789/step-Test%20fsfs%2Bra_neon/0

hth,

Lieven

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

Re: issue-2897 branch work is complete

Posted by Karl Fogel <kf...@red-bean.com>.
Kamesh Jayachandran <ka...@collab.net> writes:
> I am done with issue-2897 branch work.

Congratulations!

> I am leaving to community to decide when to merge that back to trunk.

Kamesh, just to be clear: my concerns about the branch code are merely
that very few people understand it (basically, you and glasser).  This
is not your fault, of course.  You've been quite responsive to
questions; the real problem has been lack of time for other people to
review & test.

I believe this is the right command to review the branch diff:

   $ svn diff https://svn.collab.net/repos/svn/trunk@28865 \
              https://svn.collab.net/repos/svn/branches/issue-2897

It's 3930 lines (not including test suite changes).  That's going to
take some time for people to absorb :-).  I'd love to see it merged,
and I hate the fact that you've done all this work only to have people
like me (who didn't have time to review) express a desire for more
review.  But, for example, we still don't know for sure whether SQLite
is strictly necessary, and that's a pretty big open question to have.

If the branch diff isn't too complex, that's great; I know that length
doesn't necessarily equal complexity.  But remember also that you're
very familiar with this code now: what's simple to you may be complex
to others, at this point.

-Karl

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