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

Re: [Subclipse-users] Problems synchronizing a with a repository

From: Mark Phippard <markphip_at_gmail.com>
Date: Tue, 6 Apr 2010 09:06:25 -0400

There is a Subclipse 1.6.10 release out now, and I'd recommend
upgrading. I do not think it is specifically related to your problem.

It sounds like you being bitten by a SVN bug that has been fixed.
When new items were added they were being added with the SVN
depth=empty feature which, in the case of folders, caused new
children of that folder to not be brought in via update. I think this
is the core problem you are facing.

You can fix your working copy with a fresh checkout or by following
the steps in the FAQ:

http://subclipse.tigris.org/wiki/PluginFAQ#head-c861d00ee626de8b1209689a31d4c8c5ede7b87d

The bug fix prevented the problem from happening again, but does not
fix existing working copies. So you have to take one of these actions
to fix them.

Mark

On Tue, Apr 6, 2010 at 8:55 AM, Michael Friendly <friendly_at_yorku.ca> wrote:
> I use eclipse SDK  3.5.1 & StatET for R    0.8.0.b200909221530sw   &
>  Subclipse    1.6.5  for working with R packages on R-Forge from muliple
> computers, all Win XP.
> If I work on a package from one machine, I'm always careful to update to
> HEAD first, make and
> test my changes, and finally, comit back to R-Forge.
>
> Yesterday, I added one new file, R/mosaic3d.R and updated several
> existing files in my vcdExtra
> package from my home computer and successfully did Team -> comit.  At
> work today, I first did
> Team -> update to HEAD as usual, and all the updated files appeared at
> their current revision
> in the Project Explorer, but the R/mosaic3d.R did not appear.  I
> imported a fresh copy, worked
> on it some more, and then tried to comit, but it failed, saying
> mosaic3d.R already exists.
>
> I've tried various other things, all detailed in the console log below,
> but nothing has worked so far.
>
> Can someone help me sort out what I need to do to get back in sync with
> R-Forge?
> When I've tried Team -> Synchronize with Repository, or the Synchronize
> view, there's nothing I
> see that will let me say 'Ignore svn errors; I *really* believe that my
> local copy should take precedence'.
>
> TIA
> -Michael
>
>
> add -N C:\Documents\workspace\vcdExtra\man\mosaic3d.Rd
>   A         C:/Documents/workspace/vcdExtra/man/mosaic3d.Rd
> add -N C:\Documents\workspace\vcdExtra\R\mosaic3d.R
>   A         C:/Documents/workspace/vcdExtra/R/mosaic3d.R
> commit -m "Refined & documented mosaic3d()"
> C:/Documents/workspace/vcdExtra/DESCRIPTION
> C:/Documents/workspace/vcdExtra/NAMESPACE
> C:/Documents/workspace/vcdExtra/R/mosaic3d.R
> C:/Documents/workspace/vcdExtra/man/mosaic3d.Rd
> C:/Documents/workspace/vcdExtra/man/vcdExtra-package.Rd
>   Sending        C:/Documents/workspace/vcdExtra/DESCRIPTION
>   Sending        C:/Documents/workspace/vcdExtra/NAMESPACE
>   Adding         C:/Documents/workspace/vcdExtra/R/mosaic3d.R
>   Adding         C:/Documents/workspace/vcdExtra/man/mosaic3d.Rd
>   Sending        C:/Documents/workspace/vcdExtra/man/vcdExtra-package.Rd
>   Transmitting file data ...
>   svn: Commit failed (details follow):
>   svn: Commit failed (details follow):
> svn: File already exists: filesystem '/svnroot/vcdextra/db', transaction
> '67-1', path '/pkg/R/mosaic3d.R'
> delete --force C:/Documents/workspace/vcdExtra/R/mosaic3d.R
>   D         C:/Documents/workspace/vcdExtra/R/mosaic3d.R
> commit -m "" C:/Documents/workspace/vcdExtra/DESCRIPTION
> C:/Documents/workspace/vcdExtra/NAMESPACE
> C:/Documents/workspace/vcdExtra/man/mosaic3d.Rd
> C:/Documents/workspace/vcdExtra/man/vcdExtra-package.Rd
>   Sending        C:/Documents/workspace/vcdExtra/DESCRIPTION
>   Sending        C:/Documents/workspace/vcdExtra/NAMESPACE
>   Adding         C:/Documents/workspace/vcdExtra/man/mosaic3d.Rd
>   Sending        C:/Documents/workspace/vcdExtra/man/vcdExtra-package.Rd
>   Transmitting file data ...
>   Committed revision 68.
> update C:/Documents/workspace/vcdExtra -r HEAD --force
>   At revision 68.
> add -N C:\Documents\workspace\vcdExtra\R\mosaic3d.R
>   A         C:/Documents/workspace/vcdExtra/R/mosaic3d.R
> commit -m "Re-installed mosaic3d()"
> C:/Documents/workspace/vcdExtra/R/mosaic3d.R
>   Adding         C:/Documents/workspace/vcdExtra/R/mosaic3d.R
>   Transmitting file data ...
>   svn: Commit failed (details follow):
>   svn: Commit failed (details follow):
> svn: File already exists: filesystem '/svnroot/vcdextra/db', transaction
> '68-1', path '/pkg/R/mosaic3d.R'
> update C:/Documents/workspace/vcdExtra -r HEAD --force
>   At revision 68.
> delete --force C:/Documents/workspace/vcdExtra/R/mosaic3d.R
>   D         C:/Documents/workspace/vcdExtra/R/mosaic3d.R
> update C:/Documents/workspace/vcdExtra -r HEAD --force
>   At revision 68.
>
> --
> Michael Friendly     Email: friendly AT yorku DOT ca
> Professor, Psychology Dept.
> York University      Voice: 416 736-5115 x66249 Fax: 416 736-5814
> 4700 Keele Street    http://www.math.yorku.ca/SCS/friendly.html
> Toronto, ONT  M3J 1P3 CANADA
>
> ------------------------------------------------------
> http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=2499502
>
> To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
>

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=2499620
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2010-04-06 15:06:41 CEST

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

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