David Crossley schrieb:
Ross Gardler wrote:
Ferdinand Soethe wrote:
- merge all changes
You should merge changes from the whole trunk into branch first and then
test. If all goes well you can merge back into trunk. This step is not
required but sometimes it sometimes highlights a change in
Johannes Schaefer wrote:
David Crossley schrieb:
Ross Gardler wrote:
Ferdinand Soethe wrote:
- merge all changes
You should merge changes from the whole trunk into branch first and
then test. If all goes well you can merge back into trunk. This step
is not required but sometimes it
Thinking again: I'd also need to merge the pdf-plugin dir
back into trunk so that change history of files is preserved.
Can I do such a partial merge?
Best regards,
Ferdinand Soethe
Ferdinand Soethe wrote:
If I manage to build everything into the plugin, I would like to apply
those few
Ferdinand Soethe wrote:
Thinking again: I'd also need to merge the pdf-plugin dir
back into trunk so that change history of files is preserved.
Can I do such a partial merge?
Yes, see the svn book for instructions. Merge can operate at
any level of the tree.
However, why not just merge the
If I manage to build everything into the plugin, I would
like to apply those few remaining changes
- delete main\webapp\skins\common\xslt\fo
- remove fo-pipeline from sitemap
directly to head and throw the branch away.
Best regards,
Ferdinand Soethe
Johannes Schaefer wrote:
David Crossley wrote:
Ferdinand Soethe wrote:
Thinking again: I'd also need to merge the pdf-plugin dir
back into trunk so that change history of files is preserved.
Can I do such a partial merge?
Yes, see the svn book for instructions. Merge can operate at
any level of the tree.
However,
David Crossley wrote:
Ross are you talking about using Forrest plugins?
IIUC, Ferdinand is talking about developing the code
in svn trunk. As far as i can see there can only be
one version.
David is right. Is it at all possible to have two separate
versions of a plugin in svn? And how would
Ferdinand Soethe wrote:
David Crossley wrote:
Ross are you talking about using Forrest plugins?
IIUC, Ferdinand is talking about developing the code
in svn trunk. As far as i can see there can only be
one version.
David is right. Is it at all possible to have two separate versions of a
Ross Gardler wrote:
Ferdinand Soethe wrote:
- merge all changes
You should merge changes from the whole trunk into branch first and then
test. If all goes well you can merge back into trunk. This step is not
required but sometimes it sometimes highlights a change in trunk that
affects
David Crossley wrote:
Ross Gardler wrote:
Ferdinand Soethe wrote:
So here is what I'll do:
- change version number of pdf-plugin in the branch to 0.3
- change required Forrest version number (but see below)
Yes, both the plugin number and the Forrest required version
number
If libs and stylesheets where moved to the plugin directory
(where they belong) there could be two versions of the plugin
0.2 using old fop
0.3 using fop .94
As far as I can tell, these could then be used with Forrest
0.8 und higher and people had the option to use either
Ross Gardler wrote:
Ferdinand Soethe wrote:
If libs and stylesheets where moved to the plugin directory (where they
belong) there could be two versions of the plugin
0.2 using old fop
0.3 using fop .94
Yes, both David and I responded before the mail explaining why there
were
We are almost there. The branch with FOP 94 is running
smoothly and I'm planning to merge it back by the end of
this week.
Some questions for the experts remain:
The branch changes Forrest core and the pdf-plugin
Can I do a complete merge or will the plugin have to
become a new version?
I
Ferdinand Soethe wrote:
We are almost there. The branch with FOP 94 is running
smoothly and I'm planning to merge it back by the end of
this week.
Cool!
So here is what I'll do:
- change version number of pdf-plugin in the branch to 0.3
- change required Forrest version number (but see
Ross Gardler wrote:
Ferdinand Soethe wrote:
We are almost there. The branch with FOP 94 is running
smoothly and I'm planning to merge it back by the end of
this week.
Cool!
Yes, congratulations.
The branch changes Forrest core and the pdf-plugin
Can I do a complete merge or will the
15 matches
Mail list logo
