You are viewing a plain text version of this content. The canonical link for it is here.
Posted to user@forrest.apache.org by David Crossley <cr...@apache.org> on 2004/08/04 07:22:21 UTC
Re: How to create a patch for forrest
Thanks for your effort Johannes. Yes it is better
to have a separate patch and separate Jira issues.
See other notes at the FOR-236 issue.
--David
Johannes Schaefer wrote:
> Hi!
> I put my first patch into the issue tracker,
> see FOR-236 (adds support for sDocBook Note-Title
> and adds a feedback link in the footer of the page).
> Hope it works.
> Maybe would have been better to separate them, though.
>
> Johannes
>
> Thorsten Scherler wrote:
>
> > Hello all,
> >
> > please follow the steps I now describe if you like to create a patch.
> > This way it will be for all us very easy to apply your patches.
> >
> > 1) Change your local forrest dis.
> >
> > 2) Then run in top level dir:
> > ./build.sh patch or
> > build.bat patch
> >
> > e.g. my forrest top level resides in /opt/apache/forrest:
> > thorsten@gatos:/opt/apache/forrest$ ./build.sh patch
> >
> > 3) You will see:
> > Attach the following file to a new issue in the Forrest issue tracker:
> > patch.tar.gz if you have added new files
> > patch.txt if you have only modified existing files
> > (Please review the patch first, to ensure that you have not added extra
> > stuff.)
> >
> >
> > BUILD SUCCESSFUL
> >
> > Congratulations, that means you have created a patch :).
> >
> > 4) Then open a new issue at
> > http://issues.cocoondev.org/jira/secure/CreateIssue!default.jspa (you
> > have be a register user and logged in) or add the file to a existing issue.
> >
> > If you add it to an existing issue and there are more then one
> > attachment it may makes sense to rename the file like e.g.
> > patch.css-style.txt.
> >
> > Some tips:
> >
> > * Make sure that your forrest SVN working copy
> > is up-to-date (svn update).
> > * Keep the same text indentation as in the files that
> > you are working on.
> >
> > * Make sure that your xml files and stylesheets are
> > valid xml.
> >
> > HTH
> > thorsten
Re: How to create a patch for forrest
Posted by David Crossley <cr...@apache.org>.
Johannes Schaefer wrote:
> Hi!
> I was talking "user", i.e. as user
> we modified some xsl-files. I want to
> step to the next revision (sic! 30994)
> and apply our changes there.
>
> I can't do an update, since I'm working
> on my xdocs:
> D:\forrest>svn update
> svn: Working copy 'src/documentation/content/xdocs' not locked
>
> So, we get a fresh revision and want
> our changes applied there.
Well i am really not sure what you are talking about.
Please provide more information. The first thing that
we need to know is how did you obtain your copy of Forrest?
--
David Crossley
Re: How to create a patch for forrest
Posted by Johannes Schaefer <jo...@uidesign.de>.
Hi!
I was talking "user", i.e. as user
we modified some xsl-files. I want to
step to the next revision (sic! 30994)
and apply our changes there.
I can't do an update, since I'm working
on my xdocs:
D:\forrest>svn update
svn: Working copy 'src/documentation/content/xdocs' not locked
So, we get a fresh revision and want
our changes applied there.
Any solution?
Cheers,
Johannes
David Crossley wrote:
> Johannes Schaefer wrote:
>
>>When I update to a new release,
>>how can I patch it with my changes?
>>Thanks!
>>Johannes
>
>
> (If we are talking patches and changes, then you
> are a developer and we should be talking on the
> dev list, but never mind.)
>
> It depends how you work locally. Do you have
> a "snapshot" from some time ago, or have you
> done 'svn checkout' of the head of the trunk.
>
> I work directly in my local svn working copy
> of the head repository. Sometimes i might have
> a separate working copy of the head if i am
> doing bigger changes.
>
> Here is my way ...
>
> cd /usr/local/svn/forrest
> svn update
> ...
> ... this merges changes from other committers.
> ...
> (if there were core changes, then 'build clean; build')
> ...
> edit something with my text editor
> ... for example, 'vi status.xml'
> build, test it, view it, see changes.html
> ...
> svn diff status.xml
> ... tells me what i changed.
> ...
> ... the email messages from "svn" at forrest mail list
> tells me if other people are working on that file.
> ...
> ... oops, they made changes to the file i am working on.
> ...
> svn update
> ...
> ... their changes get merged in with my local changes
> and i would be told if there were conflicts.
> ...
> continue work.
>
> By the way, "release" is the wrong word. Our latest
> release is forrest-0.5.1
>
--
User Interface Design GmbH * Teinacher Str. 38 * D-71634 Ludwigsburg
Fon +49 (0)7141 377 000 * Fax +49 (0)7141 377 00-99
Geschäftsstelle: User Interface Design GmbH * Lehrer-Götz-Weg 11 *
D-81825 München
www.uidesign.de
Buch "User Interface Tuning" von Joachim Machate & Michael Burmester
www.user-interface-tuning.de
Attraktivität von interaktiven Produkten messen mit
www.attrakdiff.de
Re: How to create a patch for forrest
Posted by David Crossley <cr...@apache.org>.
Johannes Schaefer wrote:
> When I update to a new release,
> how can I patch it with my changes?
> Thanks!
> Johannes
(If we are talking patches and changes, then you
are a developer and we should be talking on the
dev list, but never mind.)
It depends how you work locally. Do you have
a "snapshot" from some time ago, or have you
done 'svn checkout' of the head of the trunk.
I work directly in my local svn working copy
of the head repository. Sometimes i might have
a separate working copy of the head if i am
doing bigger changes.
Here is my way ...
cd /usr/local/svn/forrest
svn update
...
... this merges changes from other committers.
...
(if there were core changes, then 'build clean; build')
...
edit something with my text editor
... for example, 'vi status.xml'
build, test it, view it, see changes.html
...
svn diff status.xml
... tells me what i changed.
...
... the email messages from "svn" at forrest mail list
tells me if other people are working on that file.
...
... oops, they made changes to the file i am working on.
...
svn update
...
... their changes get merged in with my local changes
and i would be told if there were conflicts.
...
continue work.
By the way, "release" is the wrong word. Our latest
release is forrest-0.5.1
--
David Crossley
Re: How to create a patch for forrest
Posted by Johannes Schaefer <jo...@uidesign.de>.
When I update to a new release,
how can I patch it with my changes?
Thanks!
Johannes
David Crossley wrote:
> Thanks for your effort Johannes. Yes it is better
> to have a separate patch and separate Jira issues.
>
> See other notes at the FOR-236 issue.
>
> --David
>
> Johannes Schaefer wrote:
>
>>Hi!
>>I put my first patch into the issue tracker,
>>see FOR-236 (adds support for sDocBook Note-Title
>>and adds a feedback link in the footer of the page).
>>Hope it works.
>>Maybe would have been better to separate them, though.
>>
>>Johannes
>>
>>Thorsten Scherler wrote:
>>
>>
>>>Hello all,
>>>
>>>please follow the steps I now describe if you like to create a patch.
>>>This way it will be for all us very easy to apply your patches.
>>>
>>>1) Change your local forrest dis.
>>>
>>>2) Then run in top level dir:
>>>./build.sh patch or
>>>build.bat patch
>>>
>>>e.g. my forrest top level resides in /opt/apache/forrest:
>>>thorsten@gatos:/opt/apache/forrest$ ./build.sh patch
>>>
>>>3) You will see:
>>>Attach the following file to a new issue in the Forrest issue tracker:
>>> patch.tar.gz if you have added new files
>>> patch.txt if you have only modified existing files
>>>(Please review the patch first, to ensure that you have not added extra
>>>stuff.)
>>>
>>>
>>>BUILD SUCCESSFUL
>>>
>>>Congratulations, that means you have created a patch :).
>>>
>>>4) Then open a new issue at
>>>http://issues.cocoondev.org/jira/secure/CreateIssue!default.jspa (you
>>>have be a register user and logged in) or add the file to a existing issue.
>>>
>>>If you add it to an existing issue and there are more then one
>>>attachment it may makes sense to rename the file like e.g.
>>>patch.css-style.txt.
>>>
>>>Some tips:
>>>
>>>* Make sure that your forrest SVN working copy
>>>is up-to-date (svn update).
>>>* Keep the same text indentation as in the files that
>>>you are working on.
>>>
>>>* Make sure that your xml files and stylesheets are
>>>valid xml.
>>>
>>>HTH
>>>thorsten
>
--
User Interface Design GmbH * Teinacher Str. 38 * D-71634 Ludwigsburg
Fon +49 (0)7141 377 000 * Fax +49 (0)7141 377 00-99
Geschäftsstelle: User Interface Design GmbH * Lehrer-Götz-Weg 11 *
D-81825 München
www.uidesign.de
Re: How to create a patch for forrest
Posted by David Crossley <cr...@apache.org>.
Johannes Schaefer wrote:
> David Crossley wrote:
> > Johannes Schaefer wrote:
> >
> >>OK, did it. See FOR-236.
> >>svn diff > mypatch.txt does it but still gives
> >> Working copy 'src/documentation/content/xdocs' not locked
> >>I ignored it.
> >
> > I advise you not to ignore anything. SVN is telling you
> > that there is a problem for good reason. What happens
> > when you do 'svn status'?
>
> Sorry to you all ... stupid me.
> I'm quite sure that these problems will
> go away now that I've started my project
> with 'forrest seed' and NOT using the
> forrest source tree. Entschuldigung.
> Excuse me. Desculpem. Scusi. Isvenite.
> Perdon. Excuse moi.
You are excused :-) We all make blunders. This will be a
turning point for your understanding of Forrest and SVN.
By the way, with that "Working copy not locked" issue,
try doing 'svn cleanup' or maybe it would be better
to do a complete fresh checkout, though 'svn status'
and 'svn cleanup' should reveal any issues with your
current working copy.
Start with these two Forrest documents
http://forrest.apache.org/build.html
http://forrest.apache.org/docs/your-project.html
--
David Crossley
Re: How to create a patch for forrest
Posted by Johannes Schaefer <jo...@uidesign.de>.
David Crossley wrote:
> Johannes Schaefer wrote:
>
>>OK, did it. See FOR-236.
>>svn diff > mypatch.txt does it but still gives
>> Working copy 'src/documentation/content/xdocs' not locked
>>I ignored it.
>
>
> I advise you not to ignore anything. SVN is telling you
> that there is a problem for good reason. What happens
> when you do 'svn status'?
>
Sorry to you all ... stupid me.
I'm quite sure that these problems will
go away now that I've started my project
with 'forrest seed' and NOT using the
forrest source tree. Entschuldigung.
Excuse me. Desculpem. Scusi. Isvenite.
Perdon. Excuse moi.
Johannes
--
User Interface Design GmbH * Teinacher Str. 38 * D-71634 Ludwigsburg
Fon +49 (0)7141 377 000 * Fax +49 (0)7141 377 00-99
Geschäftsstelle: User Interface Design GmbH * Lehrer-Götz-Weg 11 *
D-81825 München
www.uidesign.de
Re: How to create a patch for forrest
Posted by David Crossley <cr...@apache.org>.
Johannes Schaefer wrote:
>
> OK, did it. See FOR-236.
> svn diff > mypatch.txt does it but still gives
> Working copy 'src/documentation/content/xdocs' not locked
> I ignored it.
I advise you not to ignore anything. SVN is telling you
that there is a problem for good reason. What happens
when you do 'svn status'?
--
David Crossley
Re: How to create a patch for forrest
Posted by Johannes Schaefer <jo...@uidesign.de>.
David Crossley wrote:
> Johannes Schaefer wrote:
>
>>Hi!
>>
>>I would like to create a new (better) patch,
>>but I get sth like this:
>>
>>$>build patch
>> BUILD FAILED
>> D:\forrest\build.xml:366:
>> The following error occurred while executing this line:
>> D:\forrest\tools\targets\patch.xml:74:
>> Please include the Apache Copyright header (for 2004)
>> to these files and retry:
>> D:\forrest\src\documentation\resources\images\apache-forrest.gif
>> ...
>> D:\forrest\src\documentation\resources\images\my_logo.jpg
>>
>>How can I get around this? patch.txt gets generated, though.
>
>
> I suggest that you stop using 'build patch' for the time being.
>
> If you are only changing one or two files, then it is really easy.
>
> cd $FORREST
> svn status
> ... tells what files you changed. Let us say that you changed
> src/core/context/resources/stylesheets/docbook2document.xsl
>
> Then do ...
> svn diff > my-patch.txt
> vi my-patch.txt
>
> Then attach it to the issue tracker.
>
OK, did it. See FOR-236.
svn diff > mypatch.txt does it but still gives
Working copy 'src/documentation/content/xdocs' not locked
I ignored it.
js
--
User Interface Design GmbH * Teinacher Str. 38 * D-71634 Ludwigsburg
Fon +49 (0)7141 377 000 * Fax +49 (0)7141 377 00-99
Geschäftsstelle: User Interface Design GmbH * Lehrer-Götz-Weg 11 *
D-81825 München
www.uidesign.de
Re: How to create a patch for forrest
Posted by David Crossley <cr...@apache.org>.
Johannes Schaefer wrote:
> Hi!
>
> I would like to create a new (better) patch,
> but I get sth like this:
>
> $>build patch
> BUILD FAILED
> D:\forrest\build.xml:366:
> The following error occurred while executing this line:
> D:\forrest\tools\targets\patch.xml:74:
> Please include the Apache Copyright header (for 2004)
> to these files and retry:
> D:\forrest\src\documentation\resources\images\apache-forrest.gif
> ...
> D:\forrest\src\documentation\resources\images\my_logo.jpg
>
> How can I get around this? patch.txt gets generated, though.
I suggest that you stop using 'build patch' for the time being.
If you are only changing one or two files, then it is really easy.
cd $FORREST
svn status
... tells what files you changed. Let us say that you changed
src/core/context/resources/stylesheets/docbook2document.xsl
Then do ...
svn diff > my-patch.txt
vi my-patch.txt
Then attach it to the issue tracker.
--
David Crossley
Re: How to create a patch for forrest
Posted by Johannes Schaefer <jo...@uidesign.de>.
Hi!
I would like to create a new (better) patch,
but I get sth like this:
$>build patch
BUILD FAILED
D:\forrest\build.xml:366:
The following error occurred while executing this line:
D:\forrest\tools\targets\patch.xml:74:
Please include the Apache Copyright header (for 2004)
to these files and retry:
D:\forrest\src\documentation\resources\images\apache-forrest.gif
...
D:\forrest\src\documentation\resources\images\my_logo.jpg
How can I get around this? patch.txt gets generated, though.
Thanks,
Johannes
David Crossley wrote:
> Thanks for your effort Johannes. Yes it is better
> to have a separate patch and separate Jira issues.
>
> See other notes at the FOR-236 issue.
>
> --David
>
> Johannes Schaefer wrote:
>
>>Hi!
>>I put my first patch into the issue tracker,
>>see FOR-236 (adds support for sDocBook Note-Title
>>and adds a feedback link in the footer of the page).
>>Hope it works.
>>Maybe would have been better to separate them, though.
>>
>>Johannes
>>
>>Thorsten Scherler wrote:
>>
>>
>>>Hello all,
>>>
>>>please follow the steps I now describe if you like to create a patch.
>>>This way it will be for all us very easy to apply your patches.
>>>
>>>1) Change your local forrest dis.
>>>
>>>2) Then run in top level dir:
>>>./build.sh patch or
>>>build.bat patch
>>>
>>>e.g. my forrest top level resides in /opt/apache/forrest:
>>>thorsten@gatos:/opt/apache/forrest$ ./build.sh patch
>>>
>>>3) You will see:
>>>Attach the following file to a new issue in the Forrest issue tracker:
>>> patch.tar.gz if you have added new files
>>> patch.txt if you have only modified existing files
>>>(Please review the patch first, to ensure that you have not added extra
>>>stuff.)
>>>
>>>
>>>BUILD SUCCESSFUL
>>>
>>>Congratulations, that means you have created a patch :).
>>>
>>>4) Then open a new issue at
>>>http://issues.cocoondev.org/jira/secure/CreateIssue!default.jspa (you
>>>have be a register user and logged in) or add the file to a existing issue.
>>>
>>>If you add it to an existing issue and there are more then one
>>>attachment it may makes sense to rename the file like e.g.
>>>patch.css-style.txt.
>>>
>>>Some tips:
>>>
>>>* Make sure that your forrest SVN working copy
>>>is up-to-date (svn update).
>>>* Keep the same text indentation as in the files that
>>>you are working on.
>>>
>>>* Make sure that your xml files and stylesheets are
>>>valid xml.
>>>
>>>HTH
>>>thorsten
>
>
--
User Interface Design GmbH * Teinacher Str. 38 * D-71634 Ludwigsburg
Fon +49 (0)7141 377 000 * Fax +49 (0)7141 377 00-99
Geschäftsstelle: User Interface Design GmbH * Lehrer-Götz-Weg 11 *
D-81825 München
www.uidesign.de