[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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

From: Mark Phippard <markphip_at_gmail.com>
Date: Thu, 24 Jul 2008 08:33:03 -0400

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.

Mark Phippard
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-07-24 14:33:29 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.