On 04/17/2009 06:21 PM, Stefan Küng wrote:
> Hi,
>
> A user reported here an assertion that got hit during a merge:
> http://groups.google.com/group/tortoisesvn/browse_thread/thread/beb8fe491b46004
> (tigris.org archives seem not to work when a post has an attachment...)
>
>> From the screenshot:
> In file ..\subversion\libsvn_client\mergeinfo.c, line970: assertion
> failed (pb != NULL).
Stefan,
I've tried to convert the recipe in a script, but I can't reproduce the
assert, atleast not on linux. Can you verify the script?
[[[
#!/bin/bash
SVNADMIN=/home/lgo/dev/1.6.x/subversion/svnadmin/svnadmin
SVN=/home/lgo/dev/1.6.x/subversion/svn/svn
cd /tmp
rm -rf repo
rm -rf wc
$SVNADMIN create repo
$SVN co file:///tmp/repo wc
cd wc
$SVN mkdir tags trunk trunk/project trunk/project/program branches
touch trunk/project/program/prg1.c
$SVN add trunk/project/program/prg1.c
$SVN ci . -m "test"
cd ..
rm -rf wc
$SVN co file:///tmp/repo/ wc
$SVN cp wc/trunk wc/tags/1.0
$SVN ci wc/tags -m "tag"
$SVN cp wc/trunk wc/branches/b1.0
$SVN ci wc/branches -m "branch"
$SVN up wc
echo "new line" > wc/branches/b1.0/project/program/prg1.c
$SVN ci wc/branches/b1.0 -m "mlkjmlkj"
$SVN merge --reintegrate file:///tmp/repo/branches/b1.0 wc/trunk/
]]]
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1808284
Received on 2009-04-19 17:11:05 CEST