Re: Cannot commit changes after merging from unrelated part of tree

On Thu, Jul 24, 2008 at 10:25 AM, Dennis Birkholz
<dennis.birkholz_at_nexxes.net> wrote:
> Mark Phippard schrieb:
>>
>> On Wed, Jul 23, 2008 at 11:56 PM, Dennis Birkholz
>> <dennis.birkholz_at_nexxes.net> wrote:
>>
>>> I have merged a subtree /software/abc into my tree /project/xyz. Both
>>> trees
>>> contained no common files and have no combined history and /project/xyz
>>> was
>>> created before /software/abc.
>>>
>>> When i now try to commit a change made in /project/xyz to a file that is
>>> merged from /software/abc, i got the following errors in the apache log:
>>>
>>> Could not CHECKOUT resource /repo/!svn/ver/2734/projects/xyz/myfile.php.
>>> [409, #0]
>>> resource out of date; try updating [409, #160024]
>>>
>>> I tried updating, it does not change anything. In /project/xyz i can view
>>> the complete log/history of the file from /software/abc incl a compied
>>> from
>>> /software/abc at rev XY entry.
>>>
>>> Updating the file in /software/abc works without any problems. Adding
>>> files
>>> to /project/xyz works also, including adding files to subfolders copied
>>> from
>>> /software/abc. Commiting changes to files in /software/abc that where not
>>> merged in there also works.
>>>
>>> Do anybody has a suggestion?
>>
>> I believe this problem has been fixed and will be included in 1.5.1.
>> We are just firing up the release process so it should be available
>> next week. The problem was specific to files which were 'A'dded by
>> Merge when using DAV protocol.
>>
>
> This problem is definitly a problem with the files added by merge via DAV
> protocol. I did the merge stuff via file-protocol and now it is no problem
> to commit my changes even via DAV protocol. Hopefully this get fixed in
> 1.5.1.

It is this issue which is included in 1.5.1:

http://subversion.tigris.org/issues/show_bug.cgi?id=3240

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org