[Svnmerge] Initialization problem
Wayne
wayne at zk.com
Mon Apr 7 14:45:04 PDT 2008
Wayne wrote:
> Wayne wrote:
>> Raman Gupta wrote:
>>> Wayne wrote:
>>>
>>>> Wayne wrote:
>>>>
>>>>> The plot thickens. First the requested output:
>>>>>
>>>>> >svnmerge avail -vv
>>>>> svn --non-interactive propget --strict "svnmerge-integrated" "."
>>>>> svnmerge: calculate source path for the branch
>>>>> svn --non-interactive info "."
>>>>> svnmerge: source is "http://xxxx/branches/my_branch"
>>>>> svn --non-interactive propget --strict "svnmerge-integrated"
>>>>> "http://xxxx/branches/my_branch"
>>>>> svnmerge: command execution failed (exit code: 1)
>>>>> svn --non-interactive propget --strict "svnmerge-integrated"
>>>>> "http://xxxx/branches/my_branch"
>>>>> svn: 'http://xxxx/svn/branches/my_branch' does not exist in
>>>>> revision '71'
>>>>>
>>>>> >svn pl --verbose "http://xxxx/branches/my_branch"
>>>>> svn: Unknown node kind for 'http://xxxx/branches/my_branch'
>>>>>
>>>>>
>>>>> Now if I run the prop get myself like this (my working copy was last
>>>>> updated at version 68):
>>>>> >svn propget "svnmerge-integrated"
>>>>> /branches/my_branch:1-4
>>>>>
>>>>> At this point I noticed that some check-ins had happened so I did an
>>>>> svn update. Now my working copy is at revision 71. Now if I run the
>>>>> command 'svn propget "svnmerge-integrated"' I get and empty line.
>>>>>
>>>>> The unknown node type response to the pl command concerns me.
>>>>> However,
>>>>> svnadmin verify does not report any errors.
>>>>>
>>>>>
>>>> I was just thinking about this and I remembered that I actually moved
>>>> the branch after I made it. Could that be what's causing the problem?
>>>>
>>>
>>> While moving the branch will definitely cause svnmerge.py to fail
>>> (unless the integrated property is modified to match), I don't see how
>>> moving the branch would cause the particular symptoms you are seeing.
>>> svnmerge.py would just treat the moved branch as uninitialized.
>>>
>>
> Raman, thank-you for your help. I have finally figured out what was
> going on. I should have picked it up in your previous mail. The issue
> is that svnmerge-integrated" is pointing at the original branch
> location and I need it to point at the trunk. If I had not been so
> slow on the uptake I would be done. I think that I have been able to
> fix the issue.
>
> However, your assumption that the move would cause svnmerge to treat
> the branch as unitialized is not correct. It does in fact the cause
> the error I am seeing. I have attached a small Windows batch file that
> creates a repository in c:\temp and then does some check-ins, an
> svnmerge init and then svnmerge avail. The svnmerge avail causes that
> exact error I am seeing.
>
> Thanks again for helping me figure out what was wrong.
I noticed a couple of problems with my previous script, a missing update
and commit. However, this does not change the results.
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: create_error.bat
URL: </pipermail/svnmerge/attachments/20080407/009bd39d/attachment.bat>
More information about the Svnmerge
mailing list