________________________________________
From: Stefan Sperling [stsp_at_elego.de]
Sent: 28 August 2012 15:03
To: James French
Cc: users_at_subversion.apache.org
Subject: Re: 'invalid status for updateting properties' error during reintegrate merge (was: no subject)
On Tue, Aug 28, 2012 at 01:15:08PM +0100, James French wrote:
> Hi,
>
> Using svn 1.7.6 I've had an error a couple of times on reintegration. Here is the scenario:
>
> - A file called checkBackwardsCompatibilty.bat is on trunk and has merge info on it (I don't want it to but that's a separate discussion).
> - The merge info on this file gets updated regularly as people sync up/reintegrate branches (again, I hate this, but separate discussion).
> - This file is deleted on a dev branch.
> - Reintegrate dev branch.
>
> => Error Can't set properies on 'trunk\checkBackwardsCompatibility.bat': invalid status for updating properties.
>
> I'm pretty sure I had the same sort of error as the one I'm describing here when I synced up from trunk too.
>
> It does not seem to have broken anything catastrophically, but I don't like it. I've been using 1.7.5/1.7.6 for a while now and this seems to be the main wrinkle, except for getting wc.db into a bad state and not knowing how to recover.
>
> I've attached a screenshot from tortoisesvn.
Hi James,
Can you provide a more detailed recipe that shows how to reproduce
the problem starting from an empty repository and running Subversion
operations on it?
If you like you can use the script below as a starting point.
The interesting part is marked with a comment saying:
# List of steps starts here
Currently this fails to reproduce your problem. Can you show me what
additional steps need to be done to trigger the error? Thanks!
#!/bin/sh
set -e
cwd=`pwd`
basename=`basename $0`
scratch_area="`echo $basename | sed -e s/\.sh$//`"
repos=$scratch_area/repos
trunk=$scratch_area/trunk
branch=$scratch_area/branch
trunk_url=file:///$cwd/$repos/trunk
branch_url=file:///$cwd/$repos/branch
set -x
rm -rf $scratch_area
mkdir -p $scratch_area
mkdir -p $trunk
echo alpha > $trunk/alpha
echo beta > $trunk/beta
mkdir $trunk/gamma
echo delta > $trunk/gamma/delta
mkdir $trunk/epsilon
echo zeta > $trunk/epsilon/zeta
svnadmin create $cwd/$repos
svn import $trunk $trunk_url -m "importing project tree"
svn copy $trunk_url $branch_url -m "creating branch"
rm -rf $trunk
svn checkout $trunk_url $trunk
svn checkout $trunk_url ${trunk}2
svn checkout $branch_url $branch
# List of steps starts here
svn ps foo bar $trunk/alpha
svn commit $trunk -m "set prop"
svn merge $trunk_url $branch
svn commit $branch -m "merge from trunk"
svn rm $branch/alpha
svn commit $branch -m "delete from branch"
svn update $trunk
svn merge --reintegrate $branch_url $trunk
Thanks ever so much for getting me started on this Stefan. I know its lame but I only have 2 days before going on holiday and I won't have time to try and reproduce this. I have made a note in our bug tracker to tell me to pick this up. Thanks for your help.
Received on 2012-08-28 16:49:04 CEST