You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by JT <ge...@gmail.com> on 2005/07/10 23:18:36 UTC
Problem or an I not understanding a concept?
Hi all,
I'm seeing a recurring "issue" in my Java projects that I have
imported into SVN.
First let me go over the directory structure for my projects...
ProjectName
+WEB-INF
-+classes (All my Java class files)
-+lib
-+src
--+java (All my Java source files)
Now when I import, I'm wise enough to delete everything out of the
classes directory since they can all be compiled from the sources. So
the classes folder is imported but empty. Nor do I ever add the
classes to the repository.
The problem comes later when I start checking files back in, I seem to
end up with a mirrored directory effect where svn things the classes
folder is also the java folder.
Looking through the SVN book I found the S means (to quote) "This
signifies that the file or directory has been switched from the path
of the rest of the working copy (using svn switch) to a branch." Yet
I've never used the switch command.
So I end up having to manually pull out my updated files then delete
the working copy. I re-checkout and immediately remove the classes
folder from the repository. Only then do I get back on track.
So my question to the group is... What's happening that I'm not
understanding? Is it something I'm doing or not doing that I should
be? Or is it not suppose to happen at all?
Thanks in advance,
Tim
mercury-wireless:~/Projects/DrinkyDrink tim$ /usr/local/bin/svn st
? pages/ingredients.jsp
M .classpath
M WEB-INF/struts-config.xml
M WEB-INF/src/java/org/drinkydrink/model/Drink.hbm.xml
M WEB-INF/src/java/org/drinkydrink/hibernate/HibernateGetTest.java
M WEB-INF/src/java/org/drinkydrink/dao/IngredientDAO.java
A WEB-INF/src/java/org/drinkydrink/struts/actions/IngredientManageAction.java
M WEB-INF/src/java/org/drinkydrink/struts/forms/LookupForm.java
M WEB-INF/src/java/MessageResources.properties
M WEB-INF/src/java/hibernate.cfg.xml
S WEB-INF/classes
? WEB-INF/classes/tests/org/drinkydrink/model/IngredientTests.class
? WEB-INF/classes/tests/org/drinkydrink/model/MySuite.class
? WEB-INF/classes/tests/org/drinkydrink/model/DrinkItemTests.class
? WEB-INF/classes/tests/org/drinkydrink/model/DrinkTests.class
! WEB-INF/classes/tests/org/drinkydrink/model/MySuite.java
! WEB-INF/classes/tests/org/drinkydrink/model/DrinkItemTests.java
! WEB-INF/classes/tests/org/drinkydrink/model/DrinkTests.java
! WEB-INF/classes/tests/org/drinkydrink/model/IngredientTests.java
? WEB-INF/classes/org/drinkydrink/InfrastructureException.class
! WEB-INF/classes/org/drinkydrink/InfrastructureException.java
? WEB-INF/classes/org/drinkydrink/model/DrinkItem.class
? WEB-INF/classes/org/drinkydrink/model/Drink.class
? WEB-INF/classes/org/drinkydrink/model/DrinkUnit.class
? WEB-INF/classes/org/drinkydrink/model/Ingredient.class
! WEB-INF/classes/org/drinkydrink/model/DrinkItem.java
! WEB-INF/classes/org/drinkydrink/model/Drink.java
! WEB-INF/classes/org/drinkydrink/model/DrinkUnit.java
! WEB-INF/classes/org/drinkydrink/model/Ingredient.java
M WEB-INF/classes/org/drinkydrink/model/Drink.hbm.xml
? WEB-INF/classes/org/drinkydrink/hibernate/AddRumCoke.class
? WEB-INF/classes/org/drinkydrink/hibernate/HibernateUtil.class
? WEB-INF/classes/org/drinkydrink/hibernate/HibernateGetTest.class
? WEB-INF/classes/org/drinkydrink/hibernate/HibernateTest.class
? WEB-INF/classes/org/drinkydrink/hibernate/AddLongIsland.class
! WEB-INF/classes/org/drinkydrink/hibernate/HibernateUtil.java
! WEB-INF/classes/org/drinkydrink/hibernate/HibernateTest.java
! WEB-INF/classes/org/drinkydrink/hibernate/HibernateGetTest.java
! WEB-INF/classes/org/drinkydrink/hibernate/AddLongIsland.java
! WEB-INF/classes/org/drinkydrink/hibernate/AddRumCoke.java
? WEB-INF/classes/org/drinkydrink/dao/DrinkDAO.class
? WEB-INF/classes/org/drinkydrink/dao/DrinkUnitDAO.class
? WEB-INF/classes/org/drinkydrink/dao/IngredientDAO.class
? WEB-INF/classes/org/drinkydrink/dao/DrinkItemDAO.class
! WEB-INF/classes/org/drinkydrink/dao/DrinkItemDAO.java
! WEB-INF/classes/org/drinkydrink/dao/DrinkDAO.java
! WEB-INF/classes/org/drinkydrink/dao/DrinkUnitDAO.java
! WEB-INF/classes/org/drinkydrink/dao/IngredientDAO.java
? WEB-INF/classes/org/drinkydrink/struts/actions/IngredientManageAction.class
? WEB-INF/classes/org/drinkydrink/struts/actions/IngredientViewAction.class
? WEB-INF/classes/org/drinkydrink/struts/actions/DrinksAction.class
? WEB-INF/classes/org/drinkydrink/struts/actions/ViewAction.class
! WEB-INF/classes/org/drinkydrink/struts/actions/IngredientViewAction.java
! WEB-INF/classes/org/drinkydrink/struts/actions/ViewAction.java
! WEB-INF/classes/org/drinkydrink/struts/actions/DrinksAction.java
? WEB-INF/classes/org/drinkydrink/struts/forms/LookupForm.class
! WEB-INF/classes/org/drinkydrink/struts/forms/LookupForm.java
M WEB-INF/classes/MessageResources.properties
M WEB-INF/classes/hibernate.cfg.xml
mercury-wireless:~/Projects/DrinkyDrink tim$ /usr/local/bin/svn ci
subversion/libsvn_client/commit.c:832: (apr_err=195003)
svn: Commit failed (details follow):
subversion/libsvn_client/commit_util.c:844: (apr_err=195003)
svn: Cannot commit both
'/Users/tim/Projects/DrinkyDrink/WEB-INF/classes/MessageResources.properties'
and '/Users/tim/Projects/DrinkyDrink/WEB-INF/src/java/MessageResources.properties'
as they refer to the same URL
subversion/clients/cmdline/util.c:380: (apr_err=195003)
svn: Your commit message was left in a temporary file:
subversion/clients/cmdline/util.c:380: (apr_err=195003)
svn: '/Users/tim/Projects/DrinkyDrink/svn-commit.tmp'
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Problem or an I not understanding a concept?
Posted by JT <ge...@gmail.com>.
I had checked your site before he had posted his comment. I'm checking
out Subclipse right now. I haven't used the "Team" features before so
it's all new to me. Best saved for some Java user list too. :)
Thanks to you two, I no longer have to take a trip to the bash prompt
for the regular checkins.
Tim
On 7/11/05, Jing Xue <jx...@digizenstudio.com> wrote:
> JT wrote:
>
> >Jing Xue,
> >
> >You're solution worked quite nicely! I knew Eclipse copied over files
> >but it never triggered my brain to realize that it would also copy
> >over the .svn folder like that.
> >
> >Thanks for all the help!
> >
> > Tim
> >
> >
> >
> Tim, glad it worked. Although did you check the comment posted by Mark
> Phippard? According to Mark you wouldn't have to manually set up Eclipse
> if you used Subclipse (which I probably didn't start using until after
> posting the blog).
> Cheers.
> --Jing
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Problem or an I not understanding a concept?
Posted by Jing Xue <jx...@digizenstudio.com>.
JT wrote:
>Jing Xue,
>
>You're solution worked quite nicely! I knew Eclipse copied over files
>but it never triggered my brain to realize that it would also copy
>over the .svn folder like that.
>
>Thanks for all the help!
>
> Tim
>
>
>
Tim, glad it worked. Although did you check the comment posted by Mark
Phippard? According to Mark you wouldn't have to manually set up Eclipse
if you used Subclipse (which I probably didn't start using until after
posting the blog).
Cheers.
--Jing
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Problem or an I not understanding a concept?
Posted by JT <ge...@gmail.com>.
Jing Xue,
You're solution worked quite nicely! I knew Eclipse copied over files
but it never triggered my brain to realize that it would also copy
over the .svn folder like that.
Thanks for all the help!
Tim
On 7/11/05, Jing Xue <jx...@digizenstudio.com> wrote:
> Gábor Szabó wrote:
>
> >On 7/11/05, JT <ge...@gmail.com> wrote:
> >
> >
> >
> >>svn: Cannot commit both
> >>'/Users/tim/Projects/DrinkyDrink/WEB-INF/classes/MessageResources.properties'
> >>and '/Users/tim/Projects/DrinkyDrink/WEB-INF/src/java/MessageResources.properties'
> >>as they refer to the same URL
> >>
> >>
> >
> >
> >Maybe something copied the .svn directory from the src/java directory
> >to the classes directory ?
> >
> >
> I had similar problems before when using Eclipse, whose default java
> builder treats non-java files in the source directory as resources and
> copies them to the build target directory. If you are using Eclipse,
> maybe this will help:
> http://www.digizenstudio.com/blog/2005/05/07/prevent-eclipse-from-copying-svn-folders/
>
> --Jing Xue
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Problem or an I not understanding a concept?
Posted by Jing Xue <jx...@digizenstudio.com>.
Gábor Szabó wrote:
>On 7/11/05, JT <ge...@gmail.com> wrote:
>
>
>
>>svn: Cannot commit both
>>'/Users/tim/Projects/DrinkyDrink/WEB-INF/classes/MessageResources.properties'
>>and '/Users/tim/Projects/DrinkyDrink/WEB-INF/src/java/MessageResources.properties'
>>as they refer to the same URL
>>
>>
>
>
>Maybe something copied the .svn directory from the src/java directory
>to the classes directory ?
>
>
I had similar problems before when using Eclipse, whose default java
builder treats non-java files in the source directory as resources and
copies them to the build target directory. If you are using Eclipse,
maybe this will help:
http://www.digizenstudio.com/blog/2005/05/07/prevent-eclipse-from-copying-svn-folders/
--Jing Xue
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Problem or an I not understanding a concept?
Posted by Gábor Szabó <sz...@gmail.com>.
On 7/11/05, JT <ge...@gmail.com> wrote:
> svn: Cannot commit both
> '/Users/tim/Projects/DrinkyDrink/WEB-INF/classes/MessageResources.properties'
> and '/Users/tim/Projects/DrinkyDrink/WEB-INF/src/java/MessageResources.properties'
> as they refer to the same URL
Maybe something copied the .svn directory from the src/java directory
to the classes directory ?
Gabor
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org