You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Stefan Küng <to...@gmail.com> on 2009/04/17 16:21:02 UTC
assertion during merge in 1.6.1
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...)
Re: assertion during merge in 1.6.1
Posted by Paul Burba <pt...@gmail.com>.
On Sun, Apr 19, 2009 at 11:28 AM, Stefan Küng <to...@gmail.com> wrote:
>
> 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/
> ]]]
A windows reproduction script, what a refreshing change :-) Looking
at this now.
Paul
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1825183
Re: assertion during merge in 1.6.1
Posted by Paul Burba <pt...@gmail.com>.
On Mon, Apr 20, 2009 at 12:08 PM, Stefan Küng <to...@gmail.com> wrote:
> Paul Burba wrote:
>> On Mon, Apr 20, 2009 at 11:46 AM, Stefan Küng <to...@gmail.com> wrote:
>>
>> r37385 makes it an error to attempt a reintegrate merge from and/or to
>> the root of the repository. None of these make any sense for
>> reintegrate agreed?
>
> Agreed. And thanks for your fix to now throw a proper error instead of
> hitting the assertion.
>
> Stefan
Hi Stefan,
BTW, that fix I made in r37385 is nominated for backport to 1.6.x. and
1.5.x. It's got two votes in 1.6.x/STATUS and 1.6.2 is coming very
soon, be a shame if it didn't get in...hint, hint ;-)
Paul
P.S. Senthil, I see you voted for r37385 in 1.6.x, any objections to
backporting it to 1.5.x too?
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2020404
Re: assertion during merge in 1.6.1
Posted by Stefan Küng <to...@gmail.com>.
Paul Burba wrote:
> On Mon, Apr 20, 2009 at 11:46 AM, Stefan Küng <to...@gmail.com> wrote:
>> Paul Burba wrote:
>>
>>>>> 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.
>> Hmm - I didn't create the script from that report but simply converted
>> Lievens script.
>
> Stefan,
>
> Lieven's script differs from yours in the final merge. He was
> reintegrating from the branch's URL to a trunk WC, yours was
> reintegrating from the root URL to a trunk WC (which would explain why
> his worked):
>
> lgo: $SVN merge --reintegrate file:///tmp/repo/branches/b1.0 wc/trunk/
> steveking: SVN merge --reintegrate
> file:///d:/Development/SVN/SVNTests/repo wc/trunk/
>
> Is this confusion simply the result of a typo in your script? :-)
Ups, yes, that was a typo. But I guess a very lucky one: without the
typo there's no assertion and everything works as expected.
>> What happens if you merge to trunk instead of root?
>
> We are all merging *to* trunk, it's where we are merging from that is
> the problem here. Using your script, if I attempt to merge from the
> *branch* URL to the trunk WC the reintegrate merge works as expected:
[snip]
>
> Are you seeing something different?
No, that's what I see too after 'fixing' my script.
> ~~~~~
>
> r37385 makes it an error to attempt a reintegrate merge from and/or to
> the root of the repository. None of these make any sense for
> reintegrate agreed?
Agreed. And thanks for your fix to now throw a proper error instead of
hitting the assertion.
Stefan
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1826926
Re: assertion during merge in 1.6.1
Posted by Paul Burba <pt...@gmail.com>.
On Mon, Apr 20, 2009 at 11:46 AM, Stefan Küng <to...@gmail.com> wrote:
> Paul Burba wrote:
>
>>>> 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.
>
> Hmm - I didn't create the script from that report but simply converted
> Lievens script.
Stefan,
Lieven's script differs from yours in the final merge. He was
reintegrating from the branch's URL to a trunk WC, yours was
reintegrating from the root URL to a trunk WC (which would explain why
his worked):
lgo: $SVN merge --reintegrate file:///tmp/repo/branches/b1.0 wc/trunk/
steveking: SVN merge --reintegrate
file:///d:/Development/SVN/SVNTests/repo wc/trunk/
Is this confusion simply the result of a typo in your script? :-)
> What happens if you merge to trunk instead of root?
We are all merging *to* trunk, it's where we are merging from that is
the problem here. Using your script, if I attempt to merge from the
*branch* URL to the trunk WC the reintegrate merge works as expected:
C:\Development\SVN\SVNTests>svn st wc -v
3 3 pburba wc
3 1 pburba wc\trunk
3 1 pburba wc\trunk\project
3 1 pburba wc\trunk\project\program
3 1 pburba wc\trunk\project\program\prg1.c
3 3 pburba wc\branches
3 3 pburba wc\branches\b1.0
3 3 pburba wc\branches\b1.0\project
3 3 pburba wc\branches\b1.0\project\program
4 4 pburba wc\branches\b1.0\project\program\prg1.c
3 2 pburba wc\tags
3 2 pburba wc\tags\1.0
3 2 pburba wc\tags\1.0\project
3 2 pburba wc\tags\1.0\project\program
3 2 pburba wc\tags\1.0\project\program\prg1.c
C:\Development\SVN\SVNTests>svn info wc\trunk
Path: wc\trunk
URL: file:///C:/Development/SVN/SVNTests/repo/trunk
Repository Root: file:///C:/Development/SVN/SVNTests/repo
Repository UUID: 09b69eea-46be-cc47-a1c0-ad8fc41b7200
Revision: 3
Node Kind: directory
Schedule: normal
Last Changed Author: pburba
Last Changed Rev: 1
Last Changed Date: 2009-04-20 11:51:11 -0400 (Mon, 20 Apr 2009)
C:\Development\SVN\SVNTests>svn merge --reintegrate
file:///C:/Development/SVN/SVNTests/repo/branches/b1.0 wc/trunk/
--- Merging differences between repository URLs into 'wc\trunk':
U wc\trunk\project\program\prg1.c
C:\Development\SVN\SVNTests>svn diff wc
Property changes on: wc\trunk
___________________________________________________________________
Added: svn:mergeinfo
Merged /branches/b1.0:r2-4
Index: wc/trunk/project/program/prg1.c
===================================================================
--- wc/trunk/project/program/prg1.c (revision 3)
+++ wc/trunk/project/program/prg1.c (working copy)
@@ -1 +1 @@
-ECHO is on.
+"new line"
Are you seeing something different?
~~~~~
r37385 makes it an error to attempt a reintegrate merge from and/or to
the root of the repository. None of these make any sense for
reintegrate agreed?
Paul
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1826719
Re: assertion during merge in 1.6.1
Posted by Stefan Küng <to...@gmail.com>.
Paul Burba wrote:
>>> 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.
Hmm - I didn't create the script from that report but simply converted
Lievens script.
What happens if you merge to trunk instead of root?
Stefan
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1826525
Re: assertion during merge in 1.6.1
Posted by Paul Burba <pt...@gmail.com>.
On Mon, Apr 20, 2009 at 11:27 AM, Stefan Küng <to...@gmail.com> wrote:
> Paul Burba wrote:
>> On Sun, Apr 19, 2009 at 11:28 AM, Stefan Küng <to...@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
Re: assertion during merge in 1.6.1
Posted by Stefan Küng <to...@gmail.com>.
Paul Burba wrote:
> On Sun, Apr 19, 2009 at 11:28 AM, Stefan Küng <to...@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.
Stefan
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1826398
Re: assertion during merge in 1.6.1
Posted by Paul Burba <pt...@gmail.com>.
On Sun, Apr 19, 2009 at 11:28 AM, Stefan Küng <to...@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?
Paul
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1825821
Re: assertion during merge in 1.6.1
Posted by Stefan Küng <to...@gmail.com>.
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/
]]]
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1808455
Re: assertion during merge in 1.6.1
Posted by Lieven Govaerts <sv...@mobsol.be>.
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