Conflict discovered in 'whoweare.html'

[Koji Sekiguchi <ko...@r.email.ne.jp>]

I'm trying to add mysel to whoweare.html. I've read:

Unversioned site:
http://wiki.apache.org/lucene-java/HowToUpdateTheWebsite

And I done it. Then I noticed this:

http://wiki.apache.org/lucene-java/TopLevelProject

So I ssh to people.apache.org and
cd /www/lucene.apache.org/java/docs. Then did svn up, I got:

Conflict discovered in 'whoweare.html'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options:

Then I hit Ctrl+C to cancel. I can see the modified files:

$ pwd
/www/lucene.apache.org/java/docs
$ svn status
! .
? api
? nightly
M whoweare.html
M whoweare.pdf
M developer-resources.html
M developer-resources.pdf

How can I solve the conflict?

Thanks,

Koji



---------------------------------------------------------------------
To unsubscribe, e-mail: java-dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: java-dev-help@lucene.apache.org

Re: Conflict discovered in 'whoweare.html'

[Grant Ingersoll <gs...@apache.org>]

I believe it is correct.  Let's see if it takes tonight and then we  
can fix if needed.

Plus, w/ 2.9 release, we'll do a hard sync anyway.

On Sep 24, 2009, at 4:47 PM, Chris Hostetter wrote:

> : And I done it. Then I noticed this:
> :
> : http://wiki.apache.org/lucene-java/TopLevelProject
>
> That's about the TLP site (http://lucene.apache.org/) anything in a
> subdirectory is handled by the individual project site directories.
>
> according to HowToUpdateTheWebsite, both the versioned & unversioned
> portions of the site are handled by grant's crontab using "svn export"
>
> : How can I solve the conflict?
>
> I don't think you need to worry about it ... once upon a time, the  
> site
> was updated by people using "svn co" anytime there was a change, so
> there's still svn metadata there, but since it's updated via "svn  
> export"
> now, that metadata is irrelevant.
>
> ...that's my hunch anyway, it's assuming everything on
> HowToUpdateTheWebsite is correct.
>
>
>
> -Hoss
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: java-dev-unsubscribe@lucene.apache.org
> For additional commands, e-mail: java-dev-help@lucene.apache.org
>



---------------------------------------------------------------------
To unsubscribe, e-mail: java-dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: java-dev-help@lucene.apache.org

Re: Conflict discovered in 'whoweare.html'

[Chris Hostetter <ho...@fucit.org>]

: And I done it. Then I noticed this:
: 
: http://wiki.apache.org/lucene-java/TopLevelProject

That's about the TLP site (http://lucene.apache.org/) anything in a 
subdirectory is handled by the individual project site directories.

according to HowToUpdateTheWebsite, both the versioned & unversioned 
portions of the site are handled by grant's crontab using "svn export"

: How can I solve the conflict?

I don't think you need to worry about it ... once upon a time, the site 
was updated by people using "svn co" anytime there was a change, so 
there's still svn metadata there, but since it's updated via "svn export" 
now, that metadata is irrelevant.

...that's my hunch anyway, it's assuming everything on 
HowToUpdateTheWebsite is correct.



-Hoss


---------------------------------------------------------------------
To unsubscribe, e-mail: java-dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: java-dev-help@lucene.apache.org