I adjusted TestCase_TestRepo so that one of its commits has --username=''. Sure enough, it broke. Then I applied your patch, and all was well. Nicely done!
Patch attached. Review?
[[[
Handle the case where 'svn info' returns empty fields.
* svnmerge.py
(get_svninfo): don't assume ' ' follows ':'
* svnmerge_test.py
(TestCase_TestRepo.setUp): create revisions with an empty 'author'
Patch by: Daniel Colascione <[EMAIL PROTECTED]>
Review by: Dustin J. Mitchell <[EMAIL PROTECTED]>
]]]
Dustin
P.S. This is still failing a test (ERROR: Init svnmerge, modify source
head and commit with a message). I'll try to patch that, too.
On Wed, Apr 9, 2008 at 3:58 PM, Daniel Colascione <[EMAIL PROTECTED]> wrote:
> On Wednesday 09 April 2008, Dustin J. Mitchell wrote:
> > Thanks for the patch! Any chance you could produce a test case that
> > would trigger the old, incorrect behavior?
>
> #!/bin/bash -x
> # Make sure you have svnmerge.py in $PATH
> set -e
>
> tmpdir=$(mktemp -td svnmerge-bug-XXXXXX)
>
> cleanup() { rm -rf $tmpdir; }
> trap cleanup 0
>
> cd $tmpdir
>
> svnadmin create repo
> repo="file://$PWD/repo"
> svn co $repo foo
> svn mkdir foo/trunk
> svn commit foo -m'initial rev'
> svn copy $repo/trunk $repo/1.0 --username='' -m'branch'
> svn info $repo/1.0
> svn up foo
> cd foo/trunk
> svnmerge.py init $repo/1.0
>
>
> _______________________________________________
> Svnmerge mailing list
> [email protected]
> http://www.orcaware.com/mailman/listinfo/svnmerge
>
--
Storage Software Engineer
http://www.zmanda.com
empty-svninfo.patch
Description: Binary data
_______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
