You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-dev@xmlgraphics.apache.org by Jeremias Maerki <de...@jeremias-maerki.ch> on 2008/07/17 11:34:34 UTC
svnmerge trouble
I'm trying to merge the latest changes from trunk to the
https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign
branch. But I'm getting the following error:
C:\Dev\FOP\main\xml-fop-temp5>svnmerge merge
svnmerge: command execution failed (exit code: 1)
svn merge -r 675697:677543 https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk .
--- Merging r675698 through r677543 into '.':
U test\java\org\apache\fop\config\FontsSubstitutionTestCase.java
U src\java\org\apache\fop\render\PrintRenderer.java
U src\java\org\apache\fop\render\pcl\PCLRenderer.java
U src\java\org\apache\fop\render\afp\fonts\AFPFontReader.java
U src\java\org\apache\fop\render\java2d\ConfiguredFontCollection.java
U src\java\org\apache\fop\render\java2d\Java2DRenderer.java
U src\java\org\apache\fop\hyphenation\HyphenationTree.java
U src\java\org\apache\fop\hyphenation\PatternParser.java
U src\java\org\apache\fop\fonts\FontManager.java
U src\java\org\apache\fop\fonts\CustomFontCollection.java
U src\java\org\apache\fop\tools\TestConverter.java
U src\java\org\apache\fop\tools\anttasks\Fop.java
U src\java\org\apache\fop\tools\anttasks\RunTest.java
U src\java\org\apache\fop\apps\FOURIResolver.java
U src\java\org\apache\fop\events\model\EventModel.java
U src\java\org\apache\fop\events\model\EventMethodModel.java
U src\java\org\apache\fop\events\model\EventProducerModel.java
U src\java\org\apache\fop\events\EventFormatter.xml
U src\java\org\apache\fop\fo\extensions\svg\SVGElement.java
U src\java\org\apache\fop\cli\CommandLineOptions.java
U src\java\org\apache\fop\cli\Main.java
U src\java\org\apache\fop\cli\InputHandler.java
U src\codegen\java\org\apache\fop\tools\EventProducerCollectorTask.java
Conflict for property 'svnmerge-blocked' discovered on ''.
They want to change the property value to '/xmlgraphics/fop/branches/fop-0_95:636406', you want to delete the property.
Select: (p) postpone, (mf) mine-full, (tf) theirs-full,
(h) help for more options: svn: Can't read stdin: End of file found
svn: Error reading spooled REPORT request response
Does anyone know how to deal with this?
Thanks,
Jeremias Maerki
Re: svnmerge trouble
Posted by Jeremias Maerki <de...@jeremias-maerki.ch>.
I've looked at svnmerge-migrate-history.py and performed the changes
manually on the branch. At least, I can continue now and deal with the
conflicts that appeared anyway. Let's hope my changes don't produce any
problems downstream.
On 17.07.2008 15:15:28 Jeremias Maerki wrote:
> Looks like we should think about using SVN 1.5's merge tracking instead
> of svnmerge:
> http://blogs.open.collab.net/svn/2007/10/subversion-15-m.html
>
> "svnmerge.py doesnt always properly merge merge-properties (like
> svnmerge-integrated and svnmerge-blocked), leading to property conflicts
> when merging across multiple branches. SVN 1.5 solves this."
>
> Still investigating...
>
> On 17.07.2008 11:34:34 Jeremias Maerki wrote:
> > I'm trying to merge the latest changes from trunk to the
> > https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign
> > branch. But I'm getting the following error:
> >
> > C:\Dev\FOP\main\xml-fop-temp5>svnmerge merge
> > svnmerge: command execution failed (exit code: 1)
> > svn merge -r 675697:677543 https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk .
> > --- Merging r675698 through r677543 into '.':
> > U test\java\org\apache\fop\config\FontsSubstitutionTestCase.java
> > U src\java\org\apache\fop\render\PrintRenderer.java
> > U src\java\org\apache\fop\render\pcl\PCLRenderer.java
> > U src\java\org\apache\fop\render\afp\fonts\AFPFontReader.java
> > U src\java\org\apache\fop\render\java2d\ConfiguredFontCollection.java
> > U src\java\org\apache\fop\render\java2d\Java2DRenderer.java
> > U src\java\org\apache\fop\hyphenation\HyphenationTree.java
> > U src\java\org\apache\fop\hyphenation\PatternParser.java
> > U src\java\org\apache\fop\fonts\FontManager.java
> > U src\java\org\apache\fop\fonts\CustomFontCollection.java
> > U src\java\org\apache\fop\tools\TestConverter.java
> > U src\java\org\apache\fop\tools\anttasks\Fop.java
> > U src\java\org\apache\fop\tools\anttasks\RunTest.java
> > U src\java\org\apache\fop\apps\FOURIResolver.java
> > U src\java\org\apache\fop\events\model\EventModel.java
> > U src\java\org\apache\fop\events\model\EventMethodModel.java
> > U src\java\org\apache\fop\events\model\EventProducerModel.java
> > U src\java\org\apache\fop\events\EventFormatter.xml
> > U src\java\org\apache\fop\fo\extensions\svg\SVGElement.java
> > U src\java\org\apache\fop\cli\CommandLineOptions.java
> > U src\java\org\apache\fop\cli\Main.java
> > U src\java\org\apache\fop\cli\InputHandler.java
> > U src\codegen\java\org\apache\fop\tools\EventProducerCollectorTask.java
> > Conflict for property 'svnmerge-blocked' discovered on ''.
> > They want to change the property value to '/xmlgraphics/fop/branches/fop-0_95:636406', you want to delete the property.
> > Select: (p) postpone, (mf) mine-full, (tf) theirs-full,
> > (h) help for more options: svn: Can't read stdin: End of file found
> > svn: Error reading spooled REPORT request response
> >
> >
> > Does anyone know how to deal with this?
> >
> > Thanks,
> > Jeremias Maerki
> >
>
>
>
>
> Jeremias Maerki
>
Jeremias Maerki
Re: svnmerge trouble
Posted by Jeremias Maerki <de...@jeremias-maerki.ch>.
Looks like we should think about using SVN 1.5's merge tracking instead
of svnmerge:
http://blogs.open.collab.net/svn/2007/10/subversion-15-m.html
"svnmerge.py doesnt always properly merge merge-properties (like
svnmerge-integrated and svnmerge-blocked), leading to property conflicts
when merging across multiple branches. SVN 1.5 solves this."
Still investigating...
On 17.07.2008 11:34:34 Jeremias Maerki wrote:
> I'm trying to merge the latest changes from trunk to the
> https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign
> branch. But I'm getting the following error:
>
> C:\Dev\FOP\main\xml-fop-temp5>svnmerge merge
> svnmerge: command execution failed (exit code: 1)
> svn merge -r 675697:677543 https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk .
> --- Merging r675698 through r677543 into '.':
> U test\java\org\apache\fop\config\FontsSubstitutionTestCase.java
> U src\java\org\apache\fop\render\PrintRenderer.java
> U src\java\org\apache\fop\render\pcl\PCLRenderer.java
> U src\java\org\apache\fop\render\afp\fonts\AFPFontReader.java
> U src\java\org\apache\fop\render\java2d\ConfiguredFontCollection.java
> U src\java\org\apache\fop\render\java2d\Java2DRenderer.java
> U src\java\org\apache\fop\hyphenation\HyphenationTree.java
> U src\java\org\apache\fop\hyphenation\PatternParser.java
> U src\java\org\apache\fop\fonts\FontManager.java
> U src\java\org\apache\fop\fonts\CustomFontCollection.java
> U src\java\org\apache\fop\tools\TestConverter.java
> U src\java\org\apache\fop\tools\anttasks\Fop.java
> U src\java\org\apache\fop\tools\anttasks\RunTest.java
> U src\java\org\apache\fop\apps\FOURIResolver.java
> U src\java\org\apache\fop\events\model\EventModel.java
> U src\java\org\apache\fop\events\model\EventMethodModel.java
> U src\java\org\apache\fop\events\model\EventProducerModel.java
> U src\java\org\apache\fop\events\EventFormatter.xml
> U src\java\org\apache\fop\fo\extensions\svg\SVGElement.java
> U src\java\org\apache\fop\cli\CommandLineOptions.java
> U src\java\org\apache\fop\cli\Main.java
> U src\java\org\apache\fop\cli\InputHandler.java
> U src\codegen\java\org\apache\fop\tools\EventProducerCollectorTask.java
> Conflict for property 'svnmerge-blocked' discovered on ''.
> They want to change the property value to '/xmlgraphics/fop/branches/fop-0_95:636406', you want to delete the property.
> Select: (p) postpone, (mf) mine-full, (tf) theirs-full,
> (h) help for more options: svn: Can't read stdin: End of file found
> svn: Error reading spooled REPORT request response
>
>
> Does anyone know how to deal with this?
>
> Thanks,
> Jeremias Maerki
>
Jeremias Maerki