You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Derek Wallace <De...@intunenetworks.com> on 2012/04/17 21:16:30 UTC
svn: E235000: error when performin a svn switch with SVN 1.7.4
Hi,
We are using SVN 1.7.4 (collabnet binaries on Linux).
We use SVN switch command to "switch" between different TAGs for a folder.
This has being working fine with 1.6.x. However now with 1.7.4 it produces a SVN error.
U models/micron/MT49H32M18C/ReleaseNotes.txt
U models/micron/MT49H32M18C/modulerelease.tcl
U models/micron/MT49H32M18C/rldram2.v
U models/micron/MT49H32M18C/ReleaseDiff.log
D models/cypress/CY7C1512V18/ReleaseNotes.txt
D models/cypress/CY7C1512V18/modulerelease.tcl
D models/cypress/CY7C1512V18/ReleaseDiff.log
svn: E235000: In file 'subversion/libsvn_wc/update_editor.c' line 1583: assertion failed (action == svn_wc_conflict_action_edit || action == svn_wc_conflict_action_delete || action == svn_wc_conflict_action_replace)
The next file to be checked out is **probably** a Linux soft link and this we think is what triggers the error.
The file links to a file that is a subfolder of the folder CY7C1512V18
i.e.
CY7C1512V18.vhd is a link to vhdl/CY7C1512V18.vhd
Ive tried to create a small recipe to reproduce the problem but havnt been able to.
What further information can I provide to help diagnose this issue.
Thx
Derek
-------------------------------------------------
Derek Wallace,
Director of Release Engineering,
Intune Networks Ltd
Block 9B, Park West Business Park, Nangor Road, Dublin 12, Ireland.
Phone: +353-1-6204737 Fax 353-1-6301914
URL: http://www.intunenetworks.eu
-------------------------------------------------
IMPORTANT NOTE: The information in this e-mail (and any attachments) is confidential. The contents may not be disclosed or used by anyone other than the addressee. If you are not the intended recipient, please notify the sender immediately or telephone: +353 (0)1 6204700. We cannot accept any responsibility for the accuracy or completeness of this message as it has been transmitted over a public network. If you suspect that the message may have been intercepted or amended, please call the sender.
Re: svn: E235000: error when performin a svn switch with SVN 1.7.4
Posted by Philip Martin <ph...@wandisco.com>.
Derek Wallace <De...@intunenetworks.com> writes:
> How long will it take for a new drop of SVN with a fix for this to be
> released?
See http://subversion.tigris.org/issues/show_bug.cgi?id=4160
--
Philip
RE: svn: E235000: error when performin a svn switch with SVN 1.7.4
Posted by Derek Wallace <De...@intunenetworks.com>.
HI Philip,
Ive recreated it quite simply.
How long will it take for a new drop of SVN with a fix for this to be released?
Thx
Derek
# Current Checkout (link to a file) (245975)
[derek.wallace@dublogon1 test]$ l svn_links
total 16
drwxrwxr-x 3 derek.wallace Intune Staff 1024 Apr 18 12:44 .
drwxrwxr-x 17 derek.wallace Intune Staff 2048 Apr 18 12:48 ..
lrwxrwxrwx 1 derek.wallace Intune Staff 18 Apr 18 12:44 derek1.txt -> folder1/derek1.txt
drwxrwxr-x 2 derek.wallace Intune Staff 80 Apr 18 12:26 folder1
[derek.wallace@dublogon1 test]$ svn info svn_links
Path: svn_links
Working Copy Root Path: /scratch-disk4/derek.wallace/IVX8000_trunk_FPGA
URL: svn://dubsvn1/inx8000-cr1-fpga/ivx8000/trunk/trunk/test/svn_links
Repository Root: svn://dubsvn1/inx8000-cr1-fpga
Repository UUID: baad5aac-ed56-0410-b601-f48d8304e233
Revision: 245975
Node Kind: directory
Schedule: normal
Last Changed Author: derek.wallace
Last Changed Rev: 245975
Last Changed Date: 2012-04-18 12:45:09 +0100 (Wed, 18 Apr 2012)
# switch to a revisions (245973) that doesn't have a link, but has the file name
[derek.wallace@dublogon1 test]$ svn switch svn://dubsvn1/inx8000-cr1-fpga/ivx8000/trunk/trunk/test/svn_links@245973 svn_links
svn: E235000: In file 'subversion/libsvn_wc/update_editor.c' line 1583: assertion failed (action == svn_wc_conflict_action_edit || action == svn_wc_conflict_action_delete || action == svn_wc_conflict_action_replace)
Aborted (core dumped)
# remove folder
[derek.wallace@dublogon1 test]$ rm -rf svn_links
# checkout
[derek.wallace@dublogon1 test]$ svn up svn_links -r245973
Updating 'svn_links':
Restored 'svn_links'
Restored 'svn_links/derek1.txt'
Restored 'svn_links/folder1'
Restored 'svn_links/folder1/derek1.txt'
D svn_links/derek1.txt
A svn_links/derek1.txt
Updated to revision 245973.
[derek.wallace@dublogon1 test]$ svn switch svn://dubsvn1/inx8000-cr1-fpga/ivx8000/trunk/trunk/test/svn_links@245975 svn_links
svn: E235000: In file 'subversion/libsvn_wc/update_editor.c' line 1583: assertion failed (action == svn_wc_conflict_action_edit || action == svn_wc_conflict_action_delete || action == svn_wc_conflict_action_replace)
Aborted (core dumped)
[derek.wallace@dublogon1 test]$ svn cleanup
[derek.wallace@dublogon1 test]$ svn switch svn://dubsvn1/inx8000-cr1-fpga/ivx8000/trunk/trunk/test/svn_links@245973 svn_links
At revision 245973.
[derek.wallace@dublogon1 test]$ svn switch svn://dubsvn1/inx8000-cr1-fpga/ivx8000/trunk/trunk/test/svn_links@245975 svn_links
svn: E235000: In file 'subversion/libsvn_wc/update_editor.c' line 1583: assertion failed (action == svn_wc_conflict_action_edit || action == svn_wc_conflict_action_delete || action == svn_wc_conflict_action_replace)
Aborted (core dumped)
-----Original Message-----
From: Derek Wallace
Sent: 18 April 2012 12:44
To: Philip Martin
Cc: users@subversion.apache.org; Niamh Scott; Derek Wallace; Dennis Lyness
Subject: RE: svn: E235000: error when performin a svn switch with SVN 1.7.4
Hi Philip,
Thanks for looking into this.
Im trying to create a simple recipe to illustrate the problem.
While I was creating the recipe this happened.
# Currently I have derek1.txt as a file
[derek.wallace@dublogon1 svn_links]$ l
total 16
drwxrwxr-x 3 derek.wallace Intune Staff 1024 Apr 18 12:26 .
drwxrwxr-x 17 derek.wallace Intune Staff 2048 Apr 16 11:57 ..
-rw-rw-r-- 1 derek.wallace Intune Staff 0 Apr 16 12:17 derek1.txt
drwxrwxr-x 2 derek.wallace Intune Staff 80 Apr 18 12:26 folder1
# Delete the file
[derek.wallace@dublogon1 svn_links]$ rm derek1.txt
# Create Link with the same name
[derek.wallace@dublogon1 svn_links]$ ln -s folder1/derek1.txt
[derek.wallace@dublogon1 svn_links]$ l
total 16
drwxrwxr-x 3 derek.wallace Intune Staff 1024 Apr 18 12:27 .
drwxrwxr-x 17 derek.wallace Intune Staff 2048 Apr 16 11:57 ..
lrwxrwxrwx 1 derek.wallace Intune Staff 18 Apr 18 12:27 derek1.txt -> folder1/derek1.txt
drwxrwxr-x 2 derek.wallace Intune Staff 80 Apr 18 12:26 folder1
# Tran and commit.
[derek.wallace@dublogon1 svn_links]$ svn ci -m ""
svn: E145001: Commit failed (details follow):
svn: E145001: Entry '/scratch-disk4/derek.wallace/IVX8000_trunk_FPGA/test/svn_links/derek1.txt' has unexpectedly changed special status
[derek.wallace@dublogon1 svn_links]$
Ill continue to try and create the receipe.
Thx
Derek
-----Original Message-----
From: MARTIN PHILIP [mailto:codematters@ntlworld.com] On Behalf Of Philip Martin
Sent: 18 April 2012 09:24
To: Derek Wallace
Cc: users@subversion.apache.org
Subject: Re: svn: E235000: error when performin a svn switch with SVN 1.7.4
Philip Martin <ph...@wandisco.com> writes:
> Philip Martin <ph...@wandisco.com> writes:
>
>> Please describe the changes made by the switch. Running
>>
>> svn diff --summarive URL_OF_WC URL_OF_SWITCH_TARGET
>>
>> may help.
>
> I think I may have identified it:
>
> svnadmin create repo
> svn import repo/format -mm file://`pwd`/repo/A/f svn co
> file://`pwd`/repo wc ln -s f wc/A/g svn add wc/A/g svn ci -mm wc svn
> pd svn:special wc/A/g rm wc/A/g touch wc/A/g svn ci -mm wc svn up wc
> svn up -r2 wc
> svn: E235000: In file
> '../src-1.7/subversion/libsvn_wc/update_editor.c' line 1583: assertion
> failed (action == svn_wc_conflict_action_edit || action ==
> svn_wc_conflict_action_delete || action ==
> svn_wc_conflict_action_replace)
>
> The problem is a file that gains or loses svn:special, thus changing
> to or from a symlink, without the node being replaced.
An ugly workaround is to delete the problem file to provoke a tree
conflict:
svn cleanup wc
svn rm wc/A/g
svn up -r2
svn revert wc/A/g
This does require that you identify the problem file.
--
Philip
IMPORTANT NOTE: The information in this e-mail (and any attachments) is confidential. The contents may not be disclosed or used by anyone other than the addressee. If you are not the intended recipient, please notify the sender immediately or telephone: +353 (0)1 6204700. We cannot accept any responsibility for the accuracy or completeness of this message as it has been transmitted over a public network. If you suspect that the message may have been intercepted or amended, please call the sender.
RE: svn: E235000: error when performin a svn switch with SVN 1.7.4
Posted by Derek Wallace <De...@intunenetworks.com>.
Hi Philip,
Thanks for looking into this.
Im trying to create a simple recipe to illustrate the problem.
While I was creating the recipe this happened.
# Currently I have derek1.txt as a file
[derek.wallace@dublogon1 svn_links]$ l
total 16
drwxrwxr-x 3 derek.wallace Intune Staff 1024 Apr 18 12:26 .
drwxrwxr-x 17 derek.wallace Intune Staff 2048 Apr 16 11:57 ..
-rw-rw-r-- 1 derek.wallace Intune Staff 0 Apr 16 12:17 derek1.txt
drwxrwxr-x 2 derek.wallace Intune Staff 80 Apr 18 12:26 folder1
# Delete the file
[derek.wallace@dublogon1 svn_links]$ rm derek1.txt
# Create Link with the same name
[derek.wallace@dublogon1 svn_links]$ ln -s folder1/derek1.txt
[derek.wallace@dublogon1 svn_links]$ l
total 16
drwxrwxr-x 3 derek.wallace Intune Staff 1024 Apr 18 12:27 .
drwxrwxr-x 17 derek.wallace Intune Staff 2048 Apr 16 11:57 ..
lrwxrwxrwx 1 derek.wallace Intune Staff 18 Apr 18 12:27 derek1.txt -> folder1/derek1.txt
drwxrwxr-x 2 derek.wallace Intune Staff 80 Apr 18 12:26 folder1
# Tran and commit.
[derek.wallace@dublogon1 svn_links]$ svn ci -m ""
svn: E145001: Commit failed (details follow):
svn: E145001: Entry '/scratch-disk4/derek.wallace/IVX8000_trunk_FPGA/test/svn_links/derek1.txt' has unexpectedly changed special status
[derek.wallace@dublogon1 svn_links]$
Ill continue to try and create the receipe.
Thx
Derek
-----Original Message-----
From: MARTIN PHILIP [mailto:codematters@ntlworld.com] On Behalf Of Philip Martin
Sent: 18 April 2012 09:24
To: Derek Wallace
Cc: users@subversion.apache.org
Subject: Re: svn: E235000: error when performin a svn switch with SVN 1.7.4
Philip Martin <ph...@wandisco.com> writes:
> Philip Martin <ph...@wandisco.com> writes:
>
>> Please describe the changes made by the switch. Running
>>
>> svn diff --summarive URL_OF_WC URL_OF_SWITCH_TARGET
>>
>> may help.
>
> I think I may have identified it:
>
> svnadmin create repo
> svn import repo/format -mm file://`pwd`/repo/A/f svn co
> file://`pwd`/repo wc ln -s f wc/A/g svn add wc/A/g svn ci -mm wc svn
> pd svn:special wc/A/g rm wc/A/g touch wc/A/g svn ci -mm wc svn up wc
> svn up -r2 wc
> svn: E235000: In file
> '../src-1.7/subversion/libsvn_wc/update_editor.c' line 1583: assertion
> failed (action == svn_wc_conflict_action_edit || action ==
> svn_wc_conflict_action_delete || action ==
> svn_wc_conflict_action_replace)
>
> The problem is a file that gains or loses svn:special, thus changing
> to or from a symlink, without the node being replaced.
An ugly workaround is to delete the problem file to provoke a tree
conflict:
svn cleanup wc
svn rm wc/A/g
svn up -r2
svn revert wc/A/g
This does require that you identify the problem file.
--
Philip
IMPORTANT NOTE: The information in this e-mail (and any attachments) is confidential. The contents may not be disclosed or used by anyone other than the addressee. If you are not the intended recipient, please notify the sender immediately or telephone: +353 (0)1 6204700. We cannot accept any responsibility for the accuracy or completeness of this message as it has been transmitted over a public network. If you suspect that the message may have been intercepted or amended, please call the sender.
Re: svn: E235000: error when performin a svn switch with SVN 1.7.4
Posted by Philip Martin <ph...@wandisco.com>.
Philip Martin <ph...@wandisco.com> writes:
> Philip Martin <ph...@wandisco.com> writes:
>
>> Please describe the changes made by the switch. Running
>>
>> svn diff --summarive URL_OF_WC URL_OF_SWITCH_TARGET
>>
>> may help.
>
> I think I may have identified it:
>
> svnadmin create repo
> svn import repo/format -mm file://`pwd`/repo/A/f
> svn co file://`pwd`/repo wc
> ln -s f wc/A/g
> svn add wc/A/g
> svn ci -mm wc
> svn pd svn:special wc/A/g
> rm wc/A/g
> touch wc/A/g
> svn ci -mm wc
> svn up wc
> svn up -r2 wc
> svn: E235000: In file '../src-1.7/subversion/libsvn_wc/update_editor.c' line 1583: assertion failed (action == svn_wc_conflict_action_edit || action == svn_wc_conflict_action_delete || action == svn_wc_conflict_action_replace)
>
> The problem is a file that gains or loses svn:special, thus changing to
> or from a symlink, without the node being replaced.
An ugly workaround is to delete the problem file to provoke a tree
conflict:
svn cleanup wc
svn rm wc/A/g
svn up -r2
svn revert wc/A/g
This does require that you identify the problem file.
--
Philip
Re: svn: E235000: error when performin a svn switch with SVN 1.7.4
Posted by Philip Martin <ph...@wandisco.com>.
Philip Martin <ph...@wandisco.com> writes:
> Please describe the changes made by the switch. Running
>
> svn diff --summarive URL_OF_WC URL_OF_SWITCH_TARGET
>
> may help.
I think I may have identified it:
svnadmin create repo
svn import repo/format -mm file://`pwd`/repo/A/f
svn co file://`pwd`/repo wc
ln -s f wc/A/g
svn add wc/A/g
svn ci -mm wc
svn pd svn:special wc/A/g
rm wc/A/g
touch wc/A/g
svn ci -mm wc
svn up wc
svn up -r2 wc
svn: E235000: In file '../src-1.7/subversion/libsvn_wc/update_editor.c' line 1583: assertion failed (action == svn_wc_conflict_action_edit || action == svn_wc_conflict_action_delete || action == svn_wc_conflict_action_replace)
The problem is a file that gains or loses svn:special, thus changing to
or from a symlink, without the node being replaced.
--
Philip
Re: svn: E235000: error when performin a svn switch with SVN 1.7.4
Posted by Philip Martin <ph...@wandisco.com>.
Derek Wallace <De...@intunenetworks.com> writes:
> We use SVN switch command to "switch" between different TAGs for a folder.
>
> This has being working fine with 1.6.x. However now with 1.7.4 it produces a SVN error.
>
> U models/micron/MT49H32M18C/ReleaseNotes.txt
> U models/micron/MT49H32M18C/modulerelease.tcl
> U models/micron/MT49H32M18C/rldram2.v
> U models/micron/MT49H32M18C/ReleaseDiff.log
> D models/cypress/CY7C1512V18/ReleaseNotes.txt
> D models/cypress/CY7C1512V18/modulerelease.tcl
> D models/cypress/CY7C1512V18/ReleaseDiff.log
> svn: E235000: In file 'subversion/libsvn_wc/update_editor.c' line 1583: assertion failed (action == svn_wc_conflict_action_edit || action == svn_wc_conflict_action_delete || action == svn_wc_conflict_action_replace)
>
>
> The next file to be checked out is **probably** a Linux soft link and this we think is what triggers the error.
>
> The file links to a file that is a subfolder of the folder CY7C1512V18
> i.e.
> CY7C1512V18.vhd is a link to vhdl/CY7C1512V18.vhd
>
>
>
> Ive tried to create a small recipe to reproduce the problem but havnt been able to.
>
> What further information can I provide to help diagnose this issue.
Is it reproducible: if you start with a fresh checkout can you reproduce
the error? Is it reproducible on a subset of the working copy: if you
checkout "cypress" rather than "models" can you reproduce the error?
Please describe the changes made by the switch. Running
svn diff --summarive URL_OF_WC URL_OF_SWITCH_TARGET
may help.
--
Philip