incubator-ooo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Kay Schenk <kay.sch...@gmail.com>
Subject Re: svn commit: r1209319 - in /incubator/ooo/ooo-site/trunk/content/documentation/HOW_TO/spreadsheet: sty2.GIF sty3.GIF sty5.GIF
Date Fri, 02 Dec 2011 23:16:25 GMT
Tricky situation...what to do?

On Thu, Dec 1, 2011 at 6:24 PM, Dave Fisher <wave@apache.org> wrote:

> Fixed here - Author: wave
> Date: Fri Dec  2 02:22:51 2011
> New Revision: 1209329
>
> URL: http://svn.apache.org/viewvc?rev=1209329&view=rev
> Log:
> restored and renamed the colliding files
>
> Added:
>
> incubator/ooo/ooo-site/trunk/content/documentation/HOW_TO/spreadsheet/sty2g.GIF
>   (with props)
>
> incubator/ooo/ooo-site/trunk/content/documentation/HOW_TO/spreadsheet/sty3g.GIF
>   (with props)
>
> incubator/ooo/ooo-site/trunk/content/documentation/HOW_TO/spreadsheet/sty5g.GIF
>   (with props)
> Modified:
>
> incubator/ooo/ooo-site/trunk/content/documentation/HOW_TO/spreadsheet/calc3_EN.html
>
> Modified:
> incubator/ooo/ooo-site/trunk/content/documentation/HOW_TO/spreadsheet/calc3_EN.html
> URL:
> http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/content/documentation/HOW_TO/spreadsheet/calc3_EN.html?rev=1209329&r1=1209328&r2=1209329&view=diff
>
> ==============================================================================
> ---
> incubator/ooo/ooo-site/trunk/content/documentation/HOW_TO/spreadsheet/calc3_EN.html
> (original)
> +++
> incubator/ooo/ooo-site/trunk/content/documentation/HOW_TO/spreadsheet/calc3_EN.html
> Fri Dec  2 02:22:51 2011
> @@ -68,7 +68,7 @@ Project</I></H5>
>  <LI><FONT>right click on it to access the context menu,</FONT>
>  <LI><FONT>choose <B>New...</B></FONT>
> </UL>
> -<P><IMG SRC="sty2.GIF" NAME="Graphic1" ALIGN=LEFT WIDTH=633 HEIGHT=194
> BORDER=0 alt="conditional formatting window"><BR CLEAR=LEFT>
> +<P><IMG SRC="sty2g.GIF" NAME="Graphic1" ALIGN=LEFT WIDTH=633 HEIGHT=194
> BORDER=0 alt="conditional formatting window"><BR CLEAR=LEFT>
>  <FONT>The dialog window that will appear has several tabs as in the
> diagram
>  below:</FONT></P>
> <UL>
> @@ -86,7 +86,7 @@ Project</I></H5>
> <P><FONT>In
>  the Stylist, your new style will be displayed with the name you gave it.
> Repeat
>  the steps above to create the style '<B>yellow</B>'.</FONT></P>
> -<P><IMG SRC="sty3.GIF" NAME="Graphic2" ALIGN=BOTTOM WIDTH=200 HEIGHT=222
> BORDER=0><BR>
> +<P><IMG SRC="sty3g.GIF" NAME="Graphic2" ALIGN=BOTTOM WIDTH=200 HEIGHT=222
> BORDER=0><BR>
>  <I><B>Note</B>: You have created a background style, but of course
you
> may apply
>  other features to that style. By clicking on the other tabs, you may
> access
>  many other functions, such as, apply a border, change font, alignment,
> etc.</I></P>
> @@ -116,7 +116,7 @@ Project</I></H5>
> </OL>
> <P> <FONT>Look at the result: type in '122' in cell [B9] and the color
>  changes!</FONT></p>
> -<H3><IMG SRC="sty5.GIF" NAME="Graphic5" ALIGN=LEFT WIDTH=327 HEIGHT=217
> BORDER=0></H3>
> +<H3><IMG SRC="sty5g.GIF" NAME="Graphic5" ALIGN=LEFT WIDTH=327 HEIGHT=217
> BORDER=0></H3>
> <H3>&nbsp;</H3>
> <H3>&nbsp;</H3>
> <H3>&nbsp;</H3>
>
> Added:
> incubator/ooo/ooo-site/trunk/content/documentation/HOW_TO/spreadsheet/sty2g.GIF
> URL:
> http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/content/documentation/HOW_TO/spreadsheet/sty2g.GIF?rev=1209329&view=auto
>
> ==============================================================================
> Binary file - no diff available.
>
> Propchange:
> incubator/ooo/ooo-site/trunk/content/documentation/HOW_TO/spreadsheet/sty2g.GIF
>
> ------------------------------------------------------------------------------
>   svn:mime-type = application/octet-stream
>
> Added:
> incubator/ooo/ooo-site/trunk/content/documentation/HOW_TO/spreadsheet/sty3g.GIF
> URL:
> http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/content/documentation/HOW_TO/spreadsheet/sty3g.GIF?rev=1209329&view=auto
>
> ==============================================================================
> Binary file - no diff available.
>
> Propchange:
> incubator/ooo/ooo-site/trunk/content/documentation/HOW_TO/spreadsheet/sty3g.GIF
>
> ------------------------------------------------------------------------------
>   svn:mime-type = application/octet-stream
>
> Added:
> incubator/ooo/ooo-site/trunk/content/documentation/HOW_TO/spreadsheet/sty5g.GIF
> URL:
> http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/content/documentation/HOW_TO/spreadsheet/sty5g.GIF?rev=1209329&view=auto
>
> ==============================================================================
> Binary file - no diff available.
>
> Propchange:
> incubator/ooo/ooo-site/trunk/content/documentation/HOW_TO/spreadsheet/sty5g.GIF
>
> ------------------------------------------------------------------------------
>   svn:mime-type = application/octet-stream
> On Dec 1, 2011, at 5:13 PM, Dennis E. Hamilton wrote:
>
> > Uh Oh.
> >
> > Dave, how is it known that sty2.gif and sty2.GIF were duplicates of the
> same file, and likewise for sty3.gif and sty3.GIF, sty5.gif and sty5.GIF?
> >
> > I looked at those and I'm fairly certain these were different files
> whose names happened to differ only in case.
> >
> > Whatever these files were used in, it appears that references to the 3
> deleted ones (on a case-sensitive file system) are now broken.
> >
> > (I agree it is a pain that the files have names that fail to allow
> check-out to a case-insensitive file system, I have one of those too.)
> >
> > SUGGESTION:
> >
> > Reverse the deletion.
> >
> > RENAME the *.GIF files in some way that avoids the collision.  It will
> still break any referential dependencies, but it lets us check them out and
> also leaves them in the SVN until a better solution can be found.
> >
> > (Sorry I didn't think of this sooner [;<).
> >
> >
> > - Dennis
> >
> >
> >
> > -----Original Message-----
> > From: wave@apache.org [mailto:wave@apache.org]
> > Sent: Thursday, December 01, 2011 16:13
> > To: ooo-commits@incubator.apache.org
> > Subject: svn commit: r1209319 - in
> /incubator/ooo/ooo-site/trunk/content/documentation/HOW_TO/spreadsheet:
> sty2.GIF sty3.GIF sty5.GIF
> >
> > Author: wave
> > Date: Fri Dec  2 00:13:28 2011
> > New Revision: 1209319
> >
> > URL: http://svn.apache.org/viewvc?rev=1209319&view=rev
> > Log:
> > removing duplicates
> >
> > Removed:
> >
>  incubator/ooo/ooo-site/trunk/content/documentation/HOW_TO/spreadsheet/sty2.GIF
> >
>  incubator/ooo/ooo-site/trunk/content/documentation/HOW_TO/spreadsheet/sty3.GIF
> >
>  incubator/ooo/ooo-site/trunk/content/documentation/HOW_TO/spreadsheet/sty5.GIF
> >
>
>


-- 
----------------------------------------------------------------------------------------
MzK

"The greatness of a nation and its moral progress can be judged
 by the way its animals are treated."
                              -- Mohandas Gandhi

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message