Hello all,
I am having a problem merging a branch into the trunk. I checkout the
trunk and then try to merge the branch into working copy but when I do,
I get this error message:
svn: URL
'http://svn.hddbroker.com/repos/intranet/branches/release-1.3.0/website/includes/javascript/sarissa'
doesn't match existing URL
'http://svn.hddbroker.com/repos/intranet/trunk/website/includes/javascript/sarissa'
in 'website/includes/javascript/sarissa'
I did searched the mailing list archive to see if anyone else has
encountered this problem and for the people that had their problems
resolved they used the --ignore-ancestry but when I tried it go this
error message:
svn: Can't add 'website/includes/javascript/sarissa/doc/test' to a
parent directory scheduled for deletion
I have attached a log of the commands I used to try to merge the branch
into the trunk.
I know the problem revolves around the
website/includes/javascript/sarissa' in
'website/includes/javascript/sarissa directory. In revision 260 I
deleted that directory (which contained version 9.6.1 of Sarissa) and in
revision 261 I added that directory back in (which now contained version
9.7.6 of Sarissa). It looks like to me subversion doesn't like me
deleting a directory in one revision and then creating the same
directory with new files in another revision.
I am at a loss as to what I can do to resolve this. Can anyone suggest
something?
Thank you.
--
*Richard Morris*
Toll Free: (866) 960-3331
International: +1 250 474-6022
Fax: +1 250 474-6099
E-Mail: richard@hddbroker.com <mailto:richard@hddbroker.com>
Web Site: www.hddbroker.com <http://www.hddbroker.com>
cd ~
mkdir temp
cd temp
svn checkout http://svn.hddbroker.com/repos/intranet/trunk
cd trunk
svn merge --dry-run -r239:HEAD http://svn.hddbroker.com/repos/intranet/branches/release-1.3.0
...
D website/includes/javascript/sarissa
Skipped 'website/includes/javascript/sarissa'
Skipped 'website/includes/javascript/sarissa/build_tools'
Skipped 'website/includes/javascript/sarissa/build_tools/ecmaunit'
A website/includes/javascript/sarissa/build_tools/ecmaunit/LICENSE.txt
A website/includes/javascript/sarissa/build_tools/ecmaunit/ecmaunit.js
A website/includes/javascript/sarissa/build_tools/ecmaunit/testecmaunit.js
A website/includes/javascript/sarissa/build_tools/ecmaunit/runtests.js
A website/includes/javascript/sarissa/build_tools/ecmaunit/version.txt
A website/includes/javascript/sarissa/build_tools/ecmaunit/CHANGES.txt
A website/includes/javascript/sarissa/build_tools/ecmaunit/testecmaunit.html
A website/includes/javascript/sarissa/build_tools/ecmaunit/CREDITS.txt
A website/includes/javascript/sarissa/build_tools/ecmaunit/README.txt
A website/includes/javascript/sarissa/sarissa.js
Skipped 'website/includes/javascript/sarissa/sample-apps'
Skipped 'website/includes/javascript/sarissa/sample-apps/minesweeper'
A website/includes/javascript/sarissa/sample-apps/minesweeper/MapBuilderBombList.xsl
A website/includes/javascript/sarissa/sample-apps/minesweeper/RevealBombs.xsl
A website/includes/javascript/sarissa/sample-apps/minesweeper/MapExpander.xsl
A website/includes/javascript/sarissa/sample-apps/minesweeper/index.html
A website/includes/javascript/sarissa/sample-apps/minesweeper/minesweeper.js
A website/includes/javascript/sarissa/sarissa_ieemu_load.js
A website/includes/javascript/sarissa/CHANGELOG.txt
Skipped 'website/includes/javascript/sarissa/doc'
A website/includes/javascript/sarissa/doc/index-all.html
A website/includes/javascript/sarissa/doc/overview-summary-sarissa.js.html
A website/includes/javascript/sarissa/doc/fdl.txt
A website/includes/javascript/sarissa/doc/XMLSerializer.html
A website/includes/javascript/sarissa/doc/help-doc.html
A website/includes/javascript/sarissa/doc/gpl.txt
A website/includes/javascript/sarissa/doc/XMLDocument.html
A website/includes/javascript/sarissa/doc/overview-summary-sarissa_ieemu_load.js.html
A website/includes/javascript/sarissa/doc/overview-sarissa_ieemu_load.js.html
A website/includes/javascript/sarissa/doc/XMLHttpRequest.html
A website/includes/javascript/sarissa/doc/SarissaParseError.html
A website/includes/javascript/sarissa/doc/overview-sarissa_ieemu_xpath.js.html
A website/includes/javascript/sarissa/doc/overview-sarissa_dhtml.js.html
A website/includes/javascript/sarissa/doc/test
A website/includes/javascript/sarissa/doc/test/test-output-xml.xsl.xml
A website/includes/javascript/sarissa/doc/test/test-frag.xsl.xml
A website/includes/javascript/sarissa/doc/test/testsarissa.js
A website/includes/javascript/sarissa/doc/test/test-bad.xml
A website/includes/javascript/sarissa/doc/test/test-html-frag.xsl.xml
A website/includes/javascript/sarissa/doc/test/test-output-html.xsl.xml
A website/includes/javascript/sarissa/doc/test/test-output-text.xsl.xml
A website/includes/javascript/sarissa/doc/test/testsarissa.html
A website/includes/javascript/sarissa/doc/test/test-xml-frag.xsl.xml
A website/includes/javascript/sarissa/doc/test/test.xml
A website/includes/javascript/sarissa/doc/overview-summary-sarissa_ieemu_xslt.js.html
A website/includes/javascript/sarissa/doc/stylesheet.css
A website/includes/javascript/sarissa/doc/Document.html
A website/includes/javascript/sarissa/doc/allclasses-frame.html
A website/includes/javascript/sarissa/doc/overview-sarissa_ieemu_xslt.js.html
A website/includes/javascript/sarissa/doc/overview-sarissa.js.html
A website/includes/javascript/sarissa/doc/Element.html
A website/includes/javascript/sarissa/doc/XSLTProcessor.html
A website/includes/javascript/sarissa/doc/asl.txt
A website/includes/javascript/sarissa/doc/DOMParser.html
A website/includes/javascript/sarissa/doc/jsdoc-project-summary.xml
A website/includes/javascript/sarissa/doc/overview-frame.html
A website/includes/javascript/sarissa/doc/overview-summary.html
A website/includes/javascript/sarissa/doc/overview-tree.html
A website/includes/javascript/sarissa/doc/Sarissa.html
A website/includes/javascript/sarissa/doc/overview-summary-sarissa_ieemu_xpath.js.html
A website/includes/javascript/sarissa/doc/overview-summary-sarissa_dhtml.js.html
A website/includes/javascript/sarissa/doc/index.html
A website/includes/javascript/sarissa/doc/lgpl.txt
A website/includes/javascript/sarissa/doc/XMLElement.html
A website/includes/javascript/sarissa/doc/allclasses-noframe.html
A website/includes/javascript/sarissa/sarissa_dhtml.js
A website/includes/javascript/sarissa/sarissa_ieemu_xpath.js
A website/includes/javascript/sarissa/sarissa_ieemu_xslt.js
svn merge -r239:HEAD http://svn.hddbroker.com/repos/intranet/branches/release-1.3.0
...
D website/includes/javascript/sarissa/build_tools/ecmaunit/LICENSE.txt
D website/includes/javascript/sarissa/build_tools/ecmaunit/ecmaunit.js
D website/includes/javascript/sarissa/build_tools/ecmaunit/testecmaunit.js
D website/includes/javascript/sarissa/build_tools/ecmaunit/runtests.js
D website/includes/javascript/sarissa/build_tools/ecmaunit/version.txt
D website/includes/javascript/sarissa/build_tools/ecmaunit/CHANGES.txt
D website/includes/javascript/sarissa/build_tools/ecmaunit/testecmaunit.html
D website/includes/javascript/sarissa/build_tools/ecmaunit/CREDITS.txt
D website/includes/javascript/sarissa/build_tools/ecmaunit/README.txt
D website/includes/javascript/sarissa/build_tools/ecmaunit
D website/includes/javascript/sarissa/build_tools
D website/includes/javascript/sarissa/sarissa.js
D website/includes/javascript/sarissa/testsarissa.js
D website/includes/javascript/sarissa/sample-apps/minesweeper/MapBuilderBombList.xsl
D website/includes/javascript/sarissa/sample-apps/minesweeper/RevealBombs.xsl
D website/includes/javascript/sarissa/sample-apps/minesweeper/MapExpander.xsl
D website/includes/javascript/sarissa/sample-apps/minesweeper/index.html
D website/includes/javascript/sarissa/sample-apps/minesweeper/minesweeper.js
D website/includes/javascript/sarissa/sample-apps/minesweeper
D website/includes/javascript/sarissa/sample-apps
D website/includes/javascript/sarissa/test-bad.xml
D website/includes/javascript/sarissa/doc/overview-sarissa_dhtml.js.html
D website/includes/javascript/sarissa/doc/overview-sarissa_ieemu_xpath.js.html
D website/includes/javascript/sarissa/doc/index-all.html
D website/includes/javascript/sarissa/doc/overview-summary-sarissa_ieemu_xslt.js.html
D website/includes/javascript/sarissa/doc/stylesheet.css
D website/includes/javascript/sarissa/doc/allclasses-frame.html
D website/includes/javascript/sarissa/doc/Document.html
D website/includes/javascript/sarissa/doc/overview-summary-sarissa.js.html
D website/includes/javascript/sarissa/doc/fdl.txt
D website/includes/javascript/sarissa/doc/overview-sarissa_ieemu_xslt.js.html
D website/includes/javascript/sarissa/doc/GLOBALS.html
D website/includes/javascript/sarissa/doc/overview-sarissa.js.html
D website/includes/javascript/sarissa/doc/Element.html
D website/includes/javascript/sarissa/doc/XSLTProcessor.html
D website/includes/javascript/sarissa/doc/XMLSerializer.html
D website/includes/javascript/sarissa/doc/help-doc.html
D website/includes/javascript/sarissa/doc/DOMParser.html
D website/includes/javascript/sarissa/doc/gpl.txt
D website/includes/javascript/sarissa/doc/overview-frame.html
D website/includes/javascript/sarissa/doc/XMLDocument.html
D website/includes/javascript/sarissa/doc/overview-summary.html
D website/includes/javascript/sarissa/doc/overview-tree.html
D website/includes/javascript/sarissa/doc/Sarissa.html
D website/includes/javascript/sarissa/doc/index.html
D website/includes/javascript/sarissa/doc/overview-summary-sarissa_dhtml.js.html
D website/includes/javascript/sarissa/doc/overview-summary-sarissa_ieemu_xpath.js.html
D website/includes/javascript/sarissa/doc/XMLHttpRequest.html
D website/includes/javascript/sarissa/doc/lgpl.txt
D website/includes/javascript/sarissa/doc/allclasses-noframe.html
D website/includes/javascript/sarissa/doc
D website/includes/javascript/sarissa/CHANGELOG.txt
D website/includes/javascript/sarissa/sarissa_dhtml.js
D website/includes/javascript/sarissa/sarissa_ieemu_xpath.js
D website/includes/javascript/sarissa/testsarissa.html
D website/includes/javascript/sarissa/sarissa_ieemu_xslt.js
D website/includes/javascript/sarissa/test.xml
D website/includes/javascript/sarissa
svn: URL 'http://svn.hddbroker.com/repos/intranet/branches/release-1.3.0/website/includes/javascript/sarissa' doesn't match existing URL 'http://svn.hddbroker.com/repos/intranet/trunk/website/includes/javascript/sarissa' in 'website/includes/javascript/sarissa'
svn merge --ignore-ancestry --dry-run -r239:HEAD http://svn.hddbroker.com/repos/intranet/branches/release-1.3.0
** there were a bunch of "Skipped missing target" messages but no error messages
svn merge --ignore-ancestry -r239:HEAD http://svn.hddbroker.com/repos/intranet/branches/release-1.3.0
...
Skipped missing target: 'website/includes/javascript/sarissa/testsarissa.js'
Skipped missing target: 'website/includes/javascript/sarissa/test-bad.xml'
Skipped missing target: 'website/includes/javascript/sarissa/testsarissa.html'
Skipped missing target: 'website/includes/javascript/sarissa/test.xml'
Skipped missing target: 'website/includes/javascript/sarissa/build_tools/ecmaunit/LICENSE.txt'
Skipped missing target: 'website/includes/javascript/sarissa/build_tools/ecmaunit/ecmaunit.js'
Skipped missing target: 'website/includes/javascript/sarissa/build_tools/ecmaunit/testecmaunit.js'
Skipped missing target: 'website/includes/javascript/sarissa/build_tools/ecmaunit/runtests.js'
Skipped missing target: 'website/includes/javascript/sarissa/build_tools/ecmaunit/version.txt'
Skipped missing target: 'website/includes/javascript/sarissa/build_tools/ecmaunit/CHANGES.txt'
Skipped missing target: 'website/includes/javascript/sarissa/build_tools/ecmaunit/testecmaunit.html'
Skipped missing target: 'website/includes/javascript/sarissa/build_tools/ecmaunit/CREDITS.txt'
Skipped missing target: 'website/includes/javascript/sarissa/build_tools/ecmaunit/README.txt'
Skipped missing target: 'website/includes/javascript/sarissa/sarissa.js'
Skipped missing target: 'website/includes/javascript/sarissa/sample-apps/minesweeper/MapBuilderBombList.xsl'
Skipped missing target: 'website/includes/javascript/sarissa/sample-apps/minesweeper/RevealBombs.xsl'
Skipped missing target: 'website/includes/javascript/sarissa/sample-apps/minesweeper/MapExpander.xsl'
Skipped missing target: 'website/includes/javascript/sarissa/sample-apps/minesweeper/index.html'
Skipped missing target: 'website/includes/javascript/sarissa/sample-apps/minesweeper/minesweeper.js'
A website/includes/javascript/sarissa/sarissa_ieemu_load.js
Skipped missing target: 'website/includes/javascript/sarissa/CHANGELOG.txt'
Skipped missing target: 'website/includes/javascript/sarissa/doc/GLOBALS.html'
Skipped missing target: 'website/includes/javascript/sarissa/doc/index-all.html'
Skipped missing target: 'website/includes/javascript/sarissa/doc/overview-summary-sarissa.js.html'
Skipped missing target: 'website/includes/javascript/sarissa/doc/fdl.txt'
Skipped missing target: 'website/includes/javascript/sarissa/doc/XMLSerializer.html'
Skipped missing target: 'website/includes/javascript/sarissa/doc/help-doc.html'
Skipped missing target: 'website/includes/javascript/sarissa/doc/gpl.txt'
Skipped missing target: 'website/includes/javascript/sarissa/doc/XMLDocument.html'
A website/includes/javascript/sarissa/doc/overview-summary-sarissa_ieemu_load.js.html
A website/includes/javascript/sarissa/doc/overview-sarissa_ieemu_load.js.html
Skipped missing target: 'website/includes/javascript/sarissa/doc/XMLHttpRequest.html'
A website/includes/javascript/sarissa/doc/SarissaParseError.html
Skipped missing target: 'website/includes/javascript/sarissa/doc/overview-sarissa_ieemu_xpath.js.html'
Skipped missing target: 'website/includes/javascript/sarissa/doc/overview-sarissa_dhtml.js.html'
svn: Can't add 'website/includes/javascript/sarissa/doc/test' to a parent directory scheduled for deletion
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Feb 19 19:15:49 2007