You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@forrest.apache.org by David Crossley <cr...@apache.org> on 2007/07/18 09:27:04 UTC
lost svn history for samples (Was: commit: r556367 [1/2])
Ooops. You should have used 'svn move'. This has now lost all
the svn history for those files.
-David
> Author: gmcdonald
> Date: Sat Jul 14 23:39:28 2007
> New Revision: 556367
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=556367
> Log:
> Part Two - Re-organised samples into two sections, highlights the use of sub-tabs etc. General improvement and also Fix for FOR-1001
>
> Added:
> forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/
> forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/index.xml (with props)
> forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples1/
> forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples1/ascii-art.xml (with props)
> forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples1/cocoon-pyramid.aart (with props)
> forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples1/custom.xml (with props)
> forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples1/customSchema.xml (with props)
> forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples1/ellipse.svg (with props)
> forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples1/embedded_html.html (with props)
> forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples1/faq.xml (with props)
> forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples1/hello-v10.dtd (with props)
> forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples1/helloAgain.pdf (with props)
> forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples1/howto-howto.xml (with props)
> forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples1/icon-d.png (with props)
> forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples1/index.xml (with props)
> forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples1/linking.xml (with props)
> forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples1/locationmap/
> forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples1/locationmap/index.xml (with props)
> forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples1/sample.xml (with props)
> forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples1/static.xml (with props)
> forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples1/svg.xml (with props)
> forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples1/usemap.xml (with props)
> forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples1/xml-entities.xml (with props)
> forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples2/
> forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples2/demo-i18n.de.xml (with props)
> forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples2/demo-i18n.fr.xml (with props)
> forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples2/demo-i18n.nl.xml (with props)
> forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples2/demo-i18n.xml (with props)
> forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples2/i18n.xml (with props)
> forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples2/index.xml (with props)
> forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples2/showonlywhenselected/
> forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples2/showonlywhenselected/page1.xml (with props)
> forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples2/showonlywhenselected/page2.xml (with props)
> forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples2/subdir/
> forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples2/subdir/book-sample.xml (with props)
> forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples2/subdir/hello.zip (with props)
> forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples2/subdir/index.xml (with props)
Re: lost svn history for samples (Was: commit: r556367 [1/2])
Posted by Ross Gardler <rg...@apache.org>.
On 18/07/07, Gav.... <br...@brightontown.com.au> wrote:
>
>
> > -----Original Message-----
> > From: David Crossley [mailto:crossley@apache.org]
> > Sent: Wednesday, 18 July 2007 3:27 PM
> > To: Forrest Developers List
> > Subject: lost svn history for samples (Was: commit: r556367 [1/2])
> >
> > Ooops. You should have used 'svn move'. This has now lost all
> > the svn history for those files.
> >
> > -David
>
> Welcome back :)
>
> Do you know, I did try and use 'svn move' but it would have
> none of it, several complaints of which I can't remember.
>
> I suppose we could revert back before this commit and then try
> the svn move again ? One file doesn't get moved but gets changed
> instead (index.xml) meaning we can't move that directory whole, each file
> would need to be done individually I think.
You can move the files (assuming whatever the errors you were getting
are sorted) and then edit it in the new location. When you commit it
will be "moved with changes" and other files will be moved.
> Anyway, I haven't closed the Issue as I thought I'd wait for your thoughts
> on the outcome, no-one else seems interested in this stuff but didn't
> want to close it until you were satisfied. I never tested on a MAC.
I think you'll find that it's more a case of only David does the level
of peer review that we should all be doing ;-)
Personally I like what you are doing and I'm opting for lazy consensus.
Ross
RE: lost svn history for samples (Was: commit: r556367 [1/2])
Posted by "Gav...." <br...@brightontown.com.au>.
> -----Original Message-----
> From: David Crossley [mailto:crossley@apache.org]
> Sent: Monday, 23 July 2007 6:55 AM
> To: dev@forrest.apache.org
> Subject: Re: lost svn history for samples (Was: commit: r556367 [1/2])
>
> Gav.... wrote:
> >
> > Ok, someone then had better let me know the best way to revert trunk
> back
> > so I don't bu&&er up the history again.
> >
> > I know I can revert my local changes back to before, but then should I
> > commit that, then make make new changes with svn:move then commit again
> ?
> > Is that the best way to approach it ?
>
> That should work.
>
> -David
Apologies for the delay in reverting MOTD stuff.
I now want to be sure that what I need to do is correct so I don't bugger it
up again.
I need to revert my copy of the entire /fresh-site/ to r556365
Then commit
Then publish site docs again
Then start again with my changes using svn move etc..
Does that sound about right
I will make time to do this over the weekend.
Gav...
Re: lost svn history for samples (Was: commit: r556367 [1/2])
Posted by David Crossley <cr...@apache.org>.
Gav.... wrote:
>
> Ok, someone then had better let me know the best way to revert trunk back
> so I don't bu&&er up the history again.
>
> I know I can revert my local changes back to before, but then should I
> commit that, then make make new changes with svn:move then commit again ?
> Is that the best way to approach it ?
That should work.
-David
RE: lost svn history for samples (Was: commit: r556367 [1/2])
Posted by "Gav...." <br...@brightontown.com.au>.
David,
> -----Original Message-----
> From: David Crossley [mailto:crossley@apache.org]
> Sent: Wednesday, 30 January 2008 2:49 PM
> To: dev@forrest.apache.org
> Subject: Re: lost svn history for samples (Was: commit: r556367 [1/2])
>
> On Sat, Jul 21, 2007 David Crossley wrote:
> > Gav.... wrote:
> > > From: David Crossley
> > > >
> > > > Ooops. You should have used 'svn move'. This has now lost all
> > > > the svn history for those files.
> > >
> > > Welcome back :)
> > >
> > > Do you know, I did try and use 'svn move' but it would have
> > > none of it, several complaints of which I can't remember.
> >
> > If you have problems when commiting, then please discuss
> > it with your friends.
> >
> > > I suppose we could revert back before this commit and then try
> > > the svn move again ?
> >
> > Yes please. We connot afford to lose svn history.
> >
> > If you continue to have trouble, then one of the other
> > committers will need to help.
> >
> > > One file doesn't get moved but gets changed
> > > instead (index.xml) meaning we can't move that directory whole, each
> file
> > > would need to be done individually I think.
> >
> > There is always a way. Perhaps index.xml needs to be copied
> > and the others moved. Individually perhaps. It is trivial
> > to create a temporary shell script to do the individual
> > moves and copies. For example, use 'ls samples > temp.sh'
> > and vi to edit it into a shell script which performs a
> > list of 'svn mv' or 'svn cp' commands.
>
> Done now. See https://issues.apache.org/jira/browse/FOR-1063
Wow, much work had to be done here, goes to show how a simple mistake
can blow out.
>
> In future please do reverts promptly. It makes it more difficult
> to do it later.
Absolutely, I did try at the time, my svn foo not being up to scratch I
stuffed that up too.
Thanks for your hard work on this and correcting it all.
Gav...
>
> -David
>
>
> --
> Internal Virus Database is out-of-date.
> Checked by AVG Free Edition.
> Version: 7.5.516 / Virus Database: 269.19.2 - Release Date: 1/12/2008
> 12:00 AM
Re: lost svn history for samples (Was: commit: r556367 [1/2])
Posted by David Crossley <cr...@apache.org>.
On Sat, Jul 21, 2007 David Crossley wrote:
> Gav.... wrote:
> > From: David Crossley
> > >
> > > Ooops. You should have used 'svn move'. This has now lost all
> > > the svn history for those files.
> >
> > Welcome back :)
> >
> > Do you know, I did try and use 'svn move' but it would have
> > none of it, several complaints of which I can't remember.
>
> If you have problems when commiting, then please discuss
> it with your friends.
>
> > I suppose we could revert back before this commit and then try
> > the svn move again ?
>
> Yes please. We connot afford to lose svn history.
>
> If you continue to have trouble, then one of the other
> committers will need to help.
>
> > One file doesn't get moved but gets changed
> > instead (index.xml) meaning we can't move that directory whole, each file
> > would need to be done individually I think.
>
> There is always a way. Perhaps index.xml needs to be copied
> and the others moved. Individually perhaps. It is trivial
> to create a temporary shell script to do the individual
> moves and copies. For example, use 'ls samples > temp.sh'
> and vi to edit it into a shell script which performs a
> list of 'svn mv' or 'svn cp' commands.
Done now. See https://issues.apache.org/jira/browse/FOR-1063
In future please do reverts promptly. It makes it more difficult
to do it later.
-David
RE: lost svn history for samples (Was: commit: r556367 [1/2])
Posted by "Gav...." <br...@brightontown.com.au>.
> -----Original Message-----
> From: David Crossley [mailto:crossley@apache.org]
> Sent: Saturday, 21 July 2007 1:09 PM
> To: dev@forrest.apache.org
> Subject: Re: lost svn history for samples (Was: commit: r556367 [1/2])
>
> Gav.... wrote:
> > From: David Crossley
> > >
> > > Ooops. You should have used 'svn move'. This has now lost all
> > > the svn history for those files.
> >
> > Welcome back :)
> >
> > Do you know, I did try and use 'svn move' but it would have
> > none of it, several complaints of which I can't remember.
>
> If you have problems when commiting, then please discuss
> it with your friends.
>
> > I suppose we could revert back before this commit and then try
> > the svn move again ?
>
> Yes please. We connot afford to lose svn history.
>
> If you continue to have trouble, then one of the other
> committers will need to help.
Ok, someone then had better let me know the best way to revert trunk back
so I don't bu&&er up the history again.
I know I can revert my local changes back to before, but then should I
commit that, then make make new changes with svn:move then commit again ?
Is that the best way to approach it ?
Gav...
>
> > One file doesn't get moved but gets changed
> > instead (index.xml) meaning we can't move that directory whole, each
> file
> > would need to be done individually I think.
>
> There is always a way. Perhaps index.xml needs to be copied
> and the others moved. Individually perhaps. It is trivial
> to create a temporary shell script to do the individual
> moves and copies. For example, use 'ls samples > temp.sh'
> and vi to edit it into a shell script which performs a
> list of 'svn mv' or 'svn cp' commands.
>
> -David
Re: lost svn history for samples (Was: commit: r556367 [1/2])
Posted by David Crossley <cr...@apache.org>.
Gav.... wrote:
> From: David Crossley
> >
> > Ooops. You should have used 'svn move'. This has now lost all
> > the svn history for those files.
>
> Welcome back :)
>
> Do you know, I did try and use 'svn move' but it would have
> none of it, several complaints of which I can't remember.
If you have problems when commiting, then please discuss
it with your friends.
> I suppose we could revert back before this commit and then try
> the svn move again ?
Yes please. We connot afford to lose svn history.
If you continue to have trouble, then one of the other
committers will need to help.
> One file doesn't get moved but gets changed
> instead (index.xml) meaning we can't move that directory whole, each file
> would need to be done individually I think.
There is always a way. Perhaps index.xml needs to be copied
and the others moved. Individually perhaps. It is trivial
to create a temporary shell script to do the individual
moves and copies. For example, use 'ls samples > temp.sh'
and vi to edit it into a shell script which performs a
list of 'svn mv' or 'svn cp' commands.
-David
RE: lost svn history for samples (Was: commit: r556367 [1/2])
Posted by "Gav...." <br...@brightontown.com.au>.
> -----Original Message-----
> From: David Crossley [mailto:crossley@apache.org]
> Sent: Wednesday, 18 July 2007 3:27 PM
> To: Forrest Developers List
> Subject: lost svn history for samples (Was: commit: r556367 [1/2])
>
> Ooops. You should have used 'svn move'. This has now lost all
> the svn history for those files.
>
> -David
Welcome back :)
Do you know, I did try and use 'svn move' but it would have
none of it, several complaints of which I can't remember.
I suppose we could revert back before this commit and then try
the svn move again ? One file doesn't get moved but gets changed
instead (index.xml) meaning we can't move that directory whole, each file
would need to be done individually I think.
Anyway, I haven't closed the Issue as I thought I'd wait for your thoughts
on the outcome, no-one else seems interested in this stuff but didn't
want to close it until you were satisfied. I never tested on a MAC.
Gav...
>
> > Author: gmcdonald
> > Date: Sat Jul 14 23:39:28 2007
> > New Revision: 556367
> >
> > URL: http://svn.apache.org/viewvc?view=rev&rev=556367
> > Log:
> > Part Two - Re-organised samples into two sections, highlights the use of
> sub-tabs etc. General improvement and also Fix for FOR-1001
> >
> > Added:
> > forrest/trunk/main/fresh-
> site/src/documentation/content/xdocs/samples/
> > forrest/trunk/main/fresh-
> site/src/documentation/content/xdocs/samples/index.xml (with props)
> > forrest/trunk/main/fresh-
> site/src/documentation/content/xdocs/samples1/
> > forrest/trunk/main/fresh-
> site/src/documentation/content/xdocs/samples1/ascii-art.xml (with props)
> > forrest/trunk/main/fresh-
> site/src/documentation/content/xdocs/samples1/cocoon-pyramid.aart (with
> props)
> > forrest/trunk/main/fresh-
> site/src/documentation/content/xdocs/samples1/custom.xml (with props)
> > forrest/trunk/main/fresh-
> site/src/documentation/content/xdocs/samples1/customSchema.xml (with
> props)
> > forrest/trunk/main/fresh-
> site/src/documentation/content/xdocs/samples1/ellipse.svg (with props)
> > forrest/trunk/main/fresh-
> site/src/documentation/content/xdocs/samples1/embedded_html.html (with
> props)
> > forrest/trunk/main/fresh-
> site/src/documentation/content/xdocs/samples1/faq.xml (with props)
> > forrest/trunk/main/fresh-
> site/src/documentation/content/xdocs/samples1/hello-v10.dtd (with props)
> > forrest/trunk/main/fresh-
> site/src/documentation/content/xdocs/samples1/helloAgain.pdf (with
> props)
> > forrest/trunk/main/fresh-
> site/src/documentation/content/xdocs/samples1/howto-howto.xml (with
> props)
> > forrest/trunk/main/fresh-
> site/src/documentation/content/xdocs/samples1/icon-d.png (with props)
> > forrest/trunk/main/fresh-
> site/src/documentation/content/xdocs/samples1/index.xml (with props)
> > forrest/trunk/main/fresh-
> site/src/documentation/content/xdocs/samples1/linking.xml (with props)
> > forrest/trunk/main/fresh-
> site/src/documentation/content/xdocs/samples1/locationmap/
> > forrest/trunk/main/fresh-
> site/src/documentation/content/xdocs/samples1/locationmap/index.xml
> (with props)
> > forrest/trunk/main/fresh-
> site/src/documentation/content/xdocs/samples1/sample.xml (with props)
> > forrest/trunk/main/fresh-
> site/src/documentation/content/xdocs/samples1/static.xml (with props)
> > forrest/trunk/main/fresh-
> site/src/documentation/content/xdocs/samples1/svg.xml (with props)
> > forrest/trunk/main/fresh-
> site/src/documentation/content/xdocs/samples1/usemap.xml (with props)
> > forrest/trunk/main/fresh-
> site/src/documentation/content/xdocs/samples1/xml-entities.xml (with
> props)
> > forrest/trunk/main/fresh-
> site/src/documentation/content/xdocs/samples2/
> > forrest/trunk/main/fresh-
> site/src/documentation/content/xdocs/samples2/demo-i18n.de.xml (with
> props)
> > forrest/trunk/main/fresh-
> site/src/documentation/content/xdocs/samples2/demo-i18n.fr.xml (with
> props)
> > forrest/trunk/main/fresh-
> site/src/documentation/content/xdocs/samples2/demo-i18n.nl.xml (with
> props)
> > forrest/trunk/main/fresh-
> site/src/documentation/content/xdocs/samples2/demo-i18n.xml (with props)
> > forrest/trunk/main/fresh-
> site/src/documentation/content/xdocs/samples2/i18n.xml (with props)
> > forrest/trunk/main/fresh-
> site/src/documentation/content/xdocs/samples2/index.xml (with props)
> > forrest/trunk/main/fresh-
> site/src/documentation/content/xdocs/samples2/showonlywhenselected/
> > forrest/trunk/main/fresh-
> site/src/documentation/content/xdocs/samples2/showonlywhenselected/page1.x
> ml (with props)
> > forrest/trunk/main/fresh-
> site/src/documentation/content/xdocs/samples2/showonlywhenselected/page2.x
> ml (with props)
> > forrest/trunk/main/fresh-
> site/src/documentation/content/xdocs/samples2/subdir/
> > forrest/trunk/main/fresh-
> site/src/documentation/content/xdocs/samples2/subdir/book-sample.xml
> (with props)
> > forrest/trunk/main/fresh-
> site/src/documentation/content/xdocs/samples2/subdir/hello.zip (with
> props)
> > forrest/trunk/main/fresh-
> site/src/documentation/content/xdocs/samples2/subdir/index.xml (with
> props)