Initialization problem

[Wayne J]

I am trying to setup svnmerge on a project I am working on. We created a
branch some time ago but did not run svnmerge init at that time. Now we
want to start using svnmerge. I ran svnmerge init on my branch and it
seems to have done the right thing. I see an 'svnmerge-integrated'
property with '/branches/my_branch:1-4' I think this is correct because
I did create the branch at revision 4 of the repository. However when I
try to run 'svnmerge avail' I get the following error message:

svnmerge avail
svnmerge: command execution failed (exit code: 1)
svn --non-interactive propget --strict "svnmerge-integrated"
"http://xxx/branches/my_branch"
svn: 'http://xxxx/branches/my_branch' does not exist in revision '68'

(I removed the repo path from the message and also changed the branch name)

Revision 68 is where I checked in the merge info created by svnmerge init.

Is there a way that I can fix this? Last night I played around with a
dummy repository just to see how things work and I can't figure out
what's wrong.

Thanks.
_______________________________________________
Svnmerge mailing list
Svnmerge@...
http://www.orcaware.com/mailman/listinfo/svnmerge

[Raman Gupta]

Wayne wrote:

> I am trying to setup svnmerge on a project I am working on. We created a
> branch some time ago but did not run svnmerge init at that time. Now we
> want to start using svnmerge. I ran svnmerge init on my branch and it
> seems to have done the right thing. I see an 'svnmerge-integrated'
> property with '/branches/my_branch:1-4' I think this is correct because
> I did create the branch at revision 4 of the repository. However when I
> try to run 'svnmerge avail' I get the following error message:
>
> svnmerge avail
> svnmerge: command execution failed (exit code: 1)
> svn --non-interactive propget --strict "svnmerge-integrated"
> "http://xxx/branches/my_branch"
> svn: 'http://xxxx/branches/my_branch' does not exist in revision '68'
>
> (I removed the repo path from the message and also changed the branch name)
>
> Revision 68 is where I checked in the merge info created by svnmerge init.

What do yo get if you run the following:

svn ls http://xxxx/branches/my_branch@68

Cheers,
Raman
_______________________________________________
Svnmerge mailing list
Svnmerge@...
http://www.orcaware.com/mailman/listinfo/svnmerge

[Wayne J]

Raman Gupta wrote:

> Wayne wrote:
>  
>> I am trying to setup svnmerge on a project I am working on. We created a
>> branch some time ago but did not run svnmerge init at that time. Now we
>> want to start using svnmerge. I ran svnmerge init on my branch and it
>> seems to have done the right thing. I see an 'svnmerge-integrated'
>> property with '/branches/my_branch:1-4' I think this is correct because
>> I did create the branch at revision 4 of the repository. However when I
>> try to run 'svnmerge avail' I get the following error message:
>>
>> svnmerge avail
>> svnmerge: command execution failed (exit code: 1)
>> svn --non-interactive propget --strict "svnmerge-integrated"
>> "http://xxx/branches/my_branch"
>> svn: 'http://xxxx/branches/my_branch' does not exist in revision '68'
>>
>> (I removed the repo path from the message and also changed the branch name)
>>
>> Revision 68 is where I checked in the merge info created by svnmerge init.
>>    
>
> What do yo get if you run the following:
>
> svn ls http://xxxx/branches/my_branch@68
>
> Cheers,
> Raman
> _______________________________________________
> Svnmerge mailing list
> Svnmerge@...
> http://www.orcaware.com/mailman/listinfo/svnmerge
>
>  

bin/
doc/
lib/
sandbox.pj
sandbox.use
scripts/
src/
src_lib/

A list of checked in files and folders in top level folder of my
project. 'svn status -q -N -v' in the root directory of my working copy
gives me the same list of items.
_______________________________________________
Svnmerge mailing list
Svnmerge@...
http://www.orcaware.com/mailman/listinfo/svnmerge

[Raman Gupta]

Wayne wrote:

> Raman Gupta wrote:
>> Wayne wrote:
>>> svnmerge avail
>>> svnmerge: command execution failed (exit code: 1)
>>> svn --non-interactive propget --strict "svnmerge-integrated"
>>> "http://xxx/branches/my_branch"
>>> svn: 'http://xxxx/branches/my_branch' does not exist in revision '68'
>>>
>>> (I removed the repo path from the message and also changed the branch
>>> name)
>>>
>>> Revision 68 is where I checked in the merge info created by svnmerge
>>> init.
>>
>> What do yo get if you run the following:
>>
>> svn ls http://xxxx/branches/my_branch@68
>
> bin/
> doc/
> lib/
> sandbox.pj
> sandbox.use
> scripts/
> src/
> src_lib/

So svnmerge.py is stating that http://xxxx/branches/my_branch does not
exist at rev 68, but obviously it does. Can you run the avail command
with -vv?

Also post the output of

svn pl --verbose http://xxxx/branches/my_branch

and the branch/trunk you are merging from.

Thanks,
Raman
_______________________________________________
Svnmerge mailing list
Svnmerge@...
http://www.orcaware.com/mailman/listinfo/svnmerge

[Wayne J]

Raman Gupta wrote:

> Wayne wrote:
>  
>> Raman Gupta wrote:
>>    
>>> Wayne wrote:
>>>      
>>>> svnmerge avail
>>>> svnmerge: command execution failed (exit code: 1)
>>>> svn --non-interactive propget --strict "svnmerge-integrated"
>>>> "http://xxx/branches/my_branch"
>>>> svn: 'http://xxxx/branches/my_branch' does not exist in revision '68'
>>>>
>>>> (I removed the repo path from the message and also changed the branch
>>>> name)
>>>>
>>>> Revision 68 is where I checked in the merge info created by svnmerge
>>>> init.
>>>>        
>>> What do yo get if you run the following:
>>>
>>> svn ls http://xxxx/branches/my_branch@68
>>>      
>> bin/
>> doc/
>> lib/
>> sandbox.pj
>> sandbox.use
>> scripts/
>> src/
>> src_lib/
>>    
>
> So svnmerge.py is stating that http://xxxx/branches/my_branch does not
> exist at rev 68, but obviously it does. Can you run the avail command
> with -vv?
>
> Also post the output of
>
> svn pl --verbose http://xxxx/branches/my_branch
>
> and the branch/trunk you are merging from.
>
> Thanks,
> Raman
>
>  

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.



_______________________________________________
Svnmerge mailing list
Svnmerge@...
http://www.orcaware.com/mailman/listinfo/svnmerge

[Wayne J]

Wayne wrote:

> Raman Gupta wrote:
>  
>> Wayne wrote:
>>  
>>    
>>> Raman Gupta wrote:
>>>    
>>>      
>>>> Wayne wrote:
>>>>      
>>>>        
>>>>> svnmerge avail
>>>>> svnmerge: command execution failed (exit code: 1)
>>>>> svn --non-interactive propget --strict "svnmerge-integrated"
>>>>> "http://xxx/branches/my_branch"
>>>>> svn: 'http://xxxx/branches/my_branch' does not exist in revision '68'
>>>>>
>>>>> (I removed the repo path from the message and also changed the branch
>>>>> name)
>>>>>
>>>>> Revision 68 is where I checked in the merge info created by svnmerge
>>>>> init.
>>>>>        
>>>>>          
>>>> What do yo get if you run the following:
>>>>
>>>> svn ls http://xxxx/branches/my_branch@68
>>>>      
>>>>        
>>> bin/
>>> doc/
>>> lib/
>>> sandbox.pj
>>> sandbox.use
>>> scripts/
>>> src/
>>> src_lib/
>>>    
>>>      
>> So svnmerge.py is stating that http://xxxx/branches/my_branch does not
>> exist at rev 68, but obviously it does. Can you run the avail command
>> with -vv?
>>
>> Also post the output of
>>
>> svn pl --verbose http://xxxx/branches/my_branch
>>
>> and the branch/trunk you are merging from.
>>
>> Thanks,
>> Raman
>>
>>  
>>    
> 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?

If this is the case then I think that I make a new branch (copy the same
revision to a new branch name), run svnmerge init and then copy all my
changes over. Then I will have another branch at the same point. Then I
can start merging to/from the trunk. Do you see any problems with this?
I am not really worried a lot about the history in the branch up to this
point.
_______________________________________________
Svnmerge mailing list
Svnmerge@...
http://www.orcaware.com/mailman/listinfo/svnmerge

[Raman Gupta]

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.

> If this is the case then I think that I make a new branch (copy the same
> revision to a new branch name), run svnmerge init and then copy all my
> changes over. Then I will have another branch at the same point. Then I
> can start merging to/from the trunk. Do you see any problems with this?
> I am not really worried a lot about the history in the branch up to this
> point.

I don't really understand what you are doing here. But if you are
essentially proposing to initialize merging from a new branch, just
remember that as far as svnmerge.py is concerned thats a completely
new branch with no shared revisions with any other branch (except for
the one it was copied from).

Cheers,
Raman
_______________________________________________
Svnmerge mailing list
Svnmerge@...
http://www.orcaware.com/mailman/listinfo/svnmerge

[Wayne J]

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.
>
>  
>> If this is the case then I think that I make a new branch (copy the same
>> revision to a new branch name), run svnmerge init and then copy all my
>> changes over. Then I will have another branch at the same point. Then I
>> can start merging to/from the trunk. Do you see any problems with this?
>> I am not really worried a lot about the history in the branch up to this
>> point.
>>    
>
> I don't really understand what you are doing here. But if you are
> essentially proposing to initialize merging from a new branch, just
> remember that as far as svnmerge.py is concerned thats a completely
> new branch with no shared revisions with any other branch (except for
> the one it was copied from).
>
> Cheers,
> Raman
>
>  

Our companies version control policies don't allow check-ins of anything
until a feature is complete and the code has been tested and reviewed. I
am working with another off-site developer and we are using subversion
to share our code. We started with a repository that looks like this:

      project
      /        \
trunk        branches
                        \
                      feature_branch

It's not really relevant but we have working copy that is checked out
under both version control systems. When someone updates the project in
our company version control system we check-out the changes and then
check them into subversion. That's were changes to the trunk come in.

Anyway, we decided that instead of 'feature_branch' we wanted to add
'developer_a' and 'developer_b'  directly under branches and then moved
the 'feature_branch' directory to 'branches/developer_a/feature_branch'

Now we have 3 weeks of work and a little more time right now so we
wanted to try and figure out how to use svnmerge because it looks like
it will help us keep our 'feature_branch' up to date with changes in the
trunk.

It is at this point that I ran 'svnmerge init' and 'svnmerge avail' The
integrated property was created long after the move and after 3 weeks of
working on the branch.

At this point I want to get svnmerge to work. I am wondering if I create
a new branch from revision 4 (the point were the 'feature_branch' was
created), then run 'svnmerge init', then copy over all the changes from
'feature_branch' if I can then get svnmerge to merge all the changes
from the trunk, since version 4, into my new branch.


_______________________________________________
Svnmerge mailing list
Svnmerge@...
http://www.orcaware.com/mailman/listinfo/svnmerge

[Raman Gupta]

Wayne wrote:

> Our companies version control policies don't allow check-ins of anything
> until a feature is complete and the code has been tested and reviewed. I
> am working with another off-site developer and we are using subversion
> to share our code. We started with a repository that looks like this:
>
>      project
>      /        \
> trunk        branches
>                        \
>                      feature_branch
>
> It's not really relevant but we have working copy that is checked out
> under both version control systems. When someone updates the project in
> our company version control system we check-out the changes and then
> check them into subversion. That's were changes to the trunk come in.
>
> Anyway, we decided that instead of 'feature_branch' we wanted to add
> 'developer_a' and 'developer_b'  directly under branches and then moved
> the 'feature_branch' directory to 'branches/developer_a/feature_branch'
>
> Now we have 3 weeks of work and a little more time right now so we
> wanted to try and figure out how to use svnmerge because it looks like
> it will help us keep our 'feature_branch' up to date with changes in the
> trunk.
>
> It is at this point that I ran 'svnmerge init' and 'svnmerge avail' The
> integrated property was created long after the move and after 3 weeks of
> working on the branch.
>
> At this point I want to get svnmerge to work. I am wondering if I create
> a new branch from revision 4 (the point were the 'feature_branch' was
> created), then run 'svnmerge init', then copy over all the changes from
> 'feature_branch' if I can then get svnmerge to merge all the changes
> from the trunk, since version 4, into my new branch.

I don't think that is necessary.

Your previous messages seemed to indicate you were having a problem
merging from the moved feature branches into trunk, not the other way
around:

> 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"
            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Any merge information that supported merges from your moved feature
branches to your trunk is now invalid (as shown in the -vv output
above). You should be able to manually fix things up by hand-modifying
the svnmerge-integrated property *on trunk* so that it reflects the
new names, OR you can uninit the current branches and re-init them (if
you go the latter route, init will require an explicit -r argument
otherwise it won't scan past the rename).

I'm pretty sure svnmerge.py will successfully track the history of,
and pull revisions from, the renamed branches, including the revs
before they were renamed.

Any merges from trunk to your feature branches should be unaffected by
moving them from branches/feature_branch to
branches/dev_x/feature_branch. That means that merges from the trunk
to your feature branches should continue to work without any problem,
without you changing a thing.

Cheers,
Raman Gupta
_______________________________________________
Svnmerge mailing list
Svnmerge@...
http://www.orcaware.com/mailman/listinfo/svnmerge

[Wayne J]

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.

rem Go through the steps that show the problem I am having.

rem create a temp directory and a repo
md c:\temp\svnmerge_err
md c:\temp\svnmerge_err\svn_repo
svnadmin create c:\temp\svnmerge_err\svn_repo

rem create a file to copy into the repo
cd c:\temp\svnmerge_err
md temp

echo "This should demonstrate the svnmerge problem I am having" > temp\readme.txt

rem import the file into the repository
svn import -m "Adding the initial files to the trunk" temp file:///c:/temp/svnmerge_err/svn_repo/trunk
rem cleanup
del temp\readme.txt
rd temp

rem create the branch in the wrong place
svn mkdir -m "Create branches" file:///c:/temp/svnmerge_err/svn_repo/branches
svn cp -m "Create a branch in the wrong place" file:///c:/temp/svnmerge_err/svn_repo/trunk file:///c:/temp/svnmerge_err/svn_repo/branches/branchA
rem move the branch to the right place
svn mkdir -m "Create branches" file:///c:/temp/svnmerge_err/svn_repo/branches/devA
svn cp -m "Copy the branch to the right place" file:///c:/temp/svnmerge_err/svn_repo/branches/branchA file:///c:/temp/svnmerge_err/svn_repo/branches/devA

rem remove the copy from the wrong place
svn rm -m "Delete the branch in the wrong place" file:///c:/temp/svnmerge_err/svn_repo/branches/branchA

rem check out the trunk and the branch so we can make some changes.
md trunk
svn co file:///c:/temp/svnmerge_err/svn_repo/trunk trunk

md branch
svn co file:///c:/temp/svnmerge_err/svn_repo/branches/devA/branchA branch

rem change the trunk so that there is at least 1 revision to merge
cd trunk
echo "Changes to the trunk" >> readme.txt

svn ci -m "Changing the trunk."

rem change the branch.
cd ..\branch

echo "Changes to the branch" >> readme.txt

svn ci -m "Changing the branch."

rem here's where I run into problems with svnmerge.
svnmerge init

rem this command here is what is failing.
svnmerge avail


_______________________________________________
Svnmerge mailing list
Svnmerge@...
http://www.orcaware.com/mailman/listinfo/svnmerge

[Wayne J]

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.

rem Go through the steps that show the problem I am having.

rem create a temp directory and a repo
md c:\temp\svnmerge_err
md c:\temp\svnmerge_err\svn_repo
svnadmin create c:\temp\svnmerge_err\svn_repo

rem create a file to copy into the repo
cd c:\temp\svnmerge_err
md temp

echo "This should demonstrate the svnmerge problem I am having" > temp\readme.txt

rem import the file into the repository
svn import -m "Adding the initial files to the trunk" temp file:///c:/temp/svnmerge_err/svn_repo/trunk
rem cleanup
del temp\readme.txt
rd temp

rem create the branch in the wrong place
svn mkdir -m "Create branches" file:///c:/temp/svnmerge_err/svn_repo/branches
svn cp -m "Create a branch in the wrong place" file:///c:/temp/svnmerge_err/svn_repo/trunk file:///c:/temp/svnmerge_err/svn_repo/branches/branchA
rem move the branch to the right place
svn mkdir -m "Create branches" file:///c:/temp/svnmerge_err/svn_repo/branches/devA
svn cp -m "Copy the branch to the right place" file:///c:/temp/svnmerge_err/svn_repo/branches/branchA file:///c:/temp/svnmerge_err/svn_repo/branches/devA

rem remove the copy from the wrong place
svn rm -m "Delete the branch in the wrong place" file:///c:/temp/svnmerge_err/svn_repo/branches/branchA

rem check out the trunk and the branch so we can make some changes.
md trunk
svn co file:///c:/temp/svnmerge_err/svn_repo/trunk trunk

md branch
svn co file:///c:/temp/svnmerge_err/svn_repo/branches/devA/branchA branch

rem change the trunk so that there is at least 1 revision to merge
cd trunk
echo "Changes to the trunk" >> readme.txt

svn ci -m "Changing the trunk."

rem change the branch.
cd ..\branch

echo "Changes to the branch" >> readme.txt

svn ci -m "Changing the branch."

rem here's where I run into problems with svnmerge.
svnmerge init

rem Why must I update here?
svn update

svn ci -F svnmerge-commit-message.txt
del svnmerge-commit-message.txt

rem this command here is what is failing.
svnmerge avail


_______________________________________________
Svnmerge mailing list
Svnmerge@...
http://www.orcaware.com/mailman/listinfo/svnmerge

[Raman Gupta]

Wayne wrote:

> Wayne wrote:
>> Raman Gupta wrote:
>>> 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.
>
> 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.

I should have been more specific -- the *new location* of the moved
branch would be treated as uninitialized. I believe the *old location*
of the moved branch is giving the errors you are seeing because of
buggy behavior in svn related to properties that previously existed at
a given path, but no longer do.

> Thanks again for helping me figure out what was wrong.

No problem.

Cheers,
Raman Gupta
_______________________________________________
Svnmerge mailing list
Svnmerge@...
http://www.orcaware.com/mailman/listinfo/svnmerge