On Mon, Apr 20, 2009 at 11:27 AM, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
> Paul Burba wrote:
>> On Sun, Apr 19, 2009 at 11:28 AM, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
>>> Lieven Govaerts wrote:
>>>> 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?
>>> Yes, the assertion is triggered on Windows.
>>> Here's my script (converted your bash script) for Windows:
>>>
>>> [[[
>>> set SVNADMIN=svnadmin
>>> SVN=svn
>>>
>>> cd d:\Development\SVN\SVNTests
>>>
>>> rd /s /q repo
>>> rd /s /q wc
>>>
>>> SVNADMIN create repo
>>> SVN co file:///d:/Development/SVN/SVNTests/repo wc
>>> cd wc
>>> SVN mkdir tags trunk trunk/project trunk/project/program branches
>>> echo > trunk/project/program/prg1.c
>>> SVN add trunk/project/program/prg1.c
>>> SVN ci . -m "test"
>>> cd ..
>>> rd /s /q wc
>>> SVN co file:///d:/Development/SVN/SVNTests/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:///d:/Development/SVN/SVNTests/repo wc/trunk/
>> ^^^^
>> Stefan,
>>
>> What do you expect to happen here? The script attempts to reintegrate
>> the *root* of the repository into one of the repository's branches. I
>> can add a check for this so a more descriptive error is produced,
>> i.e.:
>>
>> C:\Development\SVN\SVNTests>svn merge
>> file:///C:/Development/SVN/SVNTests/repo/branches/b1.0/ wc
>> --reintegrate
>> svn: Neither the reintegrate source nor target can be the root of the repository
>>
>> C:\Development\SVN\SVNTests>svn merge
>> file:///C:/Development/SVN/SVNTests/repo/ wc\trunk --reintegrate
>> svn: Neither the reintegrate source nor target can be the root of the repository
>>
>> Or am I missing something?
>
> I don't mind an error. But what I do mind is hitting an assertion which
> then terminates the process. That's not good.
Agreed, added the new error in r37385.
I just wanted to be sure that your script was accurately modeling the
original report
http://groups.google.com/group/tortoisesvn/browse_thread/thread/beb8fe491b46004(tigris.org?pli=1.
All that said was '10. Merge branch with trunk.' which to me meas
something *other* than merging from/to the repos root.
Paul
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1826453
Received on 2009-04-20 17:34:52 CEST