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
Received on 2009-04-20 17:46:30 CEST