You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Yves Martin <yv...@elca.ch> on 2005/09/01 15:46:16 UTC
Commit failure after a directory renaming
Hello,
I'm stuck on this renaming issue. I'm changing the java package
'ch.elca.leaf.buildsystem' into 'ch.elca.el4ant' everywhere in my source code.
I have proceeded this way:
- svn mv buildsystem/j2ee/java/ch/elca/leaf/buildsystem buildsystem/j2ee/java/ch/elca/el4ant
- svn rm buildsystem/j2ee/java/ch/elca/leaf
- do changes on files inside the directory (change package declaration for instance)
But when commiting:
[snip]
Adding buildsystem/j2ee/java/ch/elca/el4ant
Adding buildsystem/j2ee/java/ch/elca/el4ant/j2ee
Deleting buildsystem/j2ee/java/ch/elca/el4ant/j2ee/InitTask.java
Sending buildsystem/j2ee/java/ch/elca/el4ant/j2ee/J2eeInitTask.java
Sending buildsystem/j2ee/java/ch/elca/el4ant/j2ee/WarPropertyGenerator.java
Sending buildsystem/j2ee/java/ch/elca/el4ant/j2ee/antlib-j2ee.xml
Deleting buildsystem/j2ee/java/ch/elca/el4ant/j2ee/antlib.xml
Deleting buildsystem/j2ee/java/ch/elca/leaf/buildsystem
Sending buildsystem/j2ee/war-tomcat.xml
Sending buildsystem/j2ee/war-weblogic.xml
Sending buildsystem/j2ee/war.xml
svn: Commit failed (details follow):
svn: File not found: transaction '248-1', path '/trunk/buildsystem/core/java/ch/elca/el4ant/helper/ProjectLoader.java'
Other files (that does not raise any error) have been processed the same way
as buildsystem/core/java/ch/elca/el4ant/helper/ProjectLoader.java
I'm able to do a "diff" on that file:
svn diff buildsystem/core/java/ch/elca/el4ant/helper/ProjectLoader.java
Index: buildsystem/core/java/ch/elca/el4ant/helper/ProjectLoader.java
===================================================================
--- buildsystem/core/java/ch/elca/el4ant/helper/ProjectLoader.java (revision 248)
+++ buildsystem/core/java/ch/elca/el4ant/helper/ProjectLoader.java (working copy)
@@ -17,7 +17,7 @@
*/
-package ch.elca.leaf.buildsystem.helper;
+package ch.elca.el4ant.helper;
What's the trouble ? How to hack the .svn files to "make it commit" ?
Thank in advance for any help
--
Yves Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Commit failure after a directory renaming
Posted by Norbert Unterberg <nu...@gmail.com>.
2005/9/2, Yves Martin <yv...@elca.ch>:
> Why on earth does 'svn' try to delete 'InitTask.java'... I have already
> committed the renaming of
> 'buildsystem/j2ee/java/ch/elca/leaf/buildsystem/j2ee/InitTask.java' into
> 'buildsystem/j2ee/java/ch/elca/leaf/buildsystem/j2ee/J2eeInitTask.java'
> before renaming the 'leaf/buildsystem' directory into 'el4ant' ???
I do not really know the answer to your questions, but one thing I
learnt with subversion:
Whenever you commit directory changes (rename/move of files/folders,
changing folder properties etc), *update* your working copy
afterwards! This seems strange, but if you don't, you have a mixed
version working copy, and you might not be able to commit the
following folder modifications. See the chapter "Mixed Revision
Working Copies" in the subversion book, namely the "Mixed revisions
have limitations" section:
http://svnbook.red-bean.com/nightly/en/svn.basic.in-action.html#svn.basic.in-action.mixedrevs
Norbert
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Commit failure after a directory renaming
Posted by Yves Martin <yv...@elca.ch>.
Yves Martin <yv...@elca.ch> writes:
> I have proceeded this way:
> - svn mv buildsystem/j2ee/java/ch/elca/leaf/buildsystem buildsystem/j2ee/java/ch/elca/el4ant
> - svn rm buildsystem/j2ee/java/ch/elca/leaf
> - do changes on files inside the directory (change package declaration for instance)
>
> But when commiting:
> svn: Commit failed (details follow):
> svn: File not found: transaction '248-1', path '/trunk/buildsystem/core/java/ch/elca/el4ant/helper/ProjectLoader.java'
Really strange. My working copy should have been in a bad state. Need a
'cleanup' ??
However, I have done a copy of it, a complete update, apply again my renaming
'svn mv' and 'svn rm' and commit... and the error change !
[snip]
Adding buildsystem/j2ee/java/ch/elca/el4ant/j2ee
Deleting buildsystem/j2ee/java/ch/elca/el4ant/j2ee/InitTask.java
Sending buildsystem/j2ee/java/ch/elca/el4ant/j2ee/J2eeInitTask.java
[snip]
Sending project.xml
Transmitting file data ........svn: Commit failed (details follow):
svn: Delete failed--directory has no entry 'InitTask.java'
Damned !
Why on earth does 'svn' try to delete 'InitTask.java'... I have already
committed the renaming of
'buildsystem/j2ee/java/ch/elca/leaf/buildsystem/j2ee/InitTask.java' into
'buildsystem/j2ee/java/ch/elca/leaf/buildsystem/j2ee/J2eeInitTask.java'
before renaming the 'leaf/buildsystem' directory into 'el4ant' ???
I do not understand why the
'buildsystem/j2ee/java/ch/elca/el4ant/j2ee/.svn/entries' contains a reference
to 'InitTask.java':
<entry
name="InitTask.java"
copied="true"
kind="file"
schedule="delete"/>
When doing a freash checkout of
'buildsystem/j2ee/java/ch/elca/leaf/buildsystem/j2ee', the '.svn/entries'
does not contain 'InitTask.java'.
My svn client version is on Mandriva LE2005:
svn, version 1.2.0 (r14790) compiled May 31 2005, 14:45:54
My svn server is on Debian Sarge:
svn, version 1.2.0 (r14790) compiled Jun 29 2005, 12:25:51
My storage is FSFS and my protocol is 'svn://'...
Is it really a bug ? I'm not able to reproduce it perfectly. I have 4 or 5
files in that case but only one got into trouble after 'svn mv' on the
directory...
Thank you in advance for any help
--
Yves Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org