forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From David Crossley <cross...@apache.org>
Subject Re: [Problem svn...]
Date Mon, 12 Sep 2005 13:13:07 GMT
Cyriaque Dupoirieux wrote:
> Hi,

Welcome back.

>    First of all, David Crossley sent a mail - *[2005-09-05 0:21:19] new 
> committer and PMC member: Cyriaque Dupoirieux* - announcing the PMC had 
> invited me to become a committer and a member of the PMC and I could not 
> answer because I was far from home...
>    So, I want to thank you all, I had accepted with pleasure.
> 
>    Now I have problem to update my svn working copy.
>    At the beginning of august, I sent several patches to add the pelt view.
>    To make these patches, I added several new files - such as pelt.fv, 
> or several templates... - and now, I realize that svn update does not 
> merge the repository files with my working copy

Becuase these were new files.

> and put a warning such as :
> 
>    svn: Failed to add file
>    'whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/siteinfo-meta-icon.ft':
>    object of the same name is already scheduled for addition
> 
> Do you know what I should do.

If you made changes since sending the patch,
move them to another directory, so that you can
do a diff later.

Otherwise just delete your copies of those files
then do 'svn update' again.

> (I was not commiter yet at this time...)

After getting your SVN up-to-date, then
you need to use "https" as a committer.

This page doesn't seem to explain that:
http://www.apache.org/dev/version-control.html#https-svn

You might be able to use 'svn switch' - i don't know.
If not then you need a fresh checkout using https:...

-David

Mime
View raw message