Paul Burba wrote:
> On Mon, Apr 20, 2009 at 11:46 AM, Stefan Küng <tortoisesvn_at_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
Received on 2009-04-20 18:09:15 CEST