You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Se...@eaton.com on 2006/09/14 02:18:40 UTC

SVN 1.3.1 gives inexplicable error in merge

Hi, I'm trying to do a merge with svn 1.3.1 on a Solaris 10 machine and get the following error:

bash-3.00$ svn co http://un-eng1/svn/sw/branches/users/sunger/NewInt5_MergeTracker

... lots of added files ...

bash-3.00$ svn merge -r 3021:4320 http://un-eng1/svn/sw/branches/users/ppascoe/SC200Display NewInt5_MergeTracker                     
Skipped missing target: 'NewInt5_MergeTracker/tools/host/host.prd'
Skipped missing target: 'NewInt5_MergeTracker/tools/host/harness/displayManager.h'
Skipped 'NewInt5_MergeTracker/tools/host/harness/sc200/translateDisplayBuffer.h'
Skipped missing target: 'NewInt5_MergeTracker/tools/host/harness/sc200/sc200gui.h'
Skipped missing target: 'NewInt5_MergeTracker/tools/host/harness/sc200/testBitmap.h'
Skipped missing target: 'NewInt5_MergeTracker/tools/host/harness/sc200/sc200Gui.xd'
Skipped 'NewInt5_MergeTracker/tools/host/harness/sc200/src/translateDisplayBuffer.c'
Skipped missing target: 'NewInt5_MergeTracker/tools/host/harness/sc200/src/sc200displayBuffer.cc'
Skipped missing target: 'NewInt5_MergeTracker/tools/host/harness/sc200/src/sc200events.c'
Skipped missing target: 'NewInt5_MergeTracker/tools/host/harness/sc200/src/sc200gui.c'
Skipped missing target: 'NewInt5_MergeTracker/tools/host/harness/sc200/src'
Skipped missing target: 'NewInt5_MergeTracker/tools/host/harness/sc200/sc200displayBuffer.h'
Skipped missing target: 'NewInt5_MergeTracker/tools/host/harness/sc200'
Skipped missing target: 'NewInt5_MergeTracker/tools/host/harness/src/displayBuffer.cc'
Skipped missing target: 'NewInt5_MergeTracker/tools/host/harness/src/displayManager.cc'
Skipped missing target: 'NewInt5_MergeTracker/tools/host/harness/src'
Skipped missing target: 'NewInt5_MergeTracker/tools/host/harness'
Skipped missing target: 'NewInt5_MergeTracker/tools/host'
Skipped missing target: 'NewInt5_MergeTracker/tools'
Skipped missing target: 'NewInt5_MergeTracker/IcpUpgrader/Packager.cc'
Skipped missing target: 'NewInt5_MergeTracker/IcpUpgrader/ICPFile/ICPFile.h'
Skipped missing target: 'NewInt5_MergeTracker/IcpUpgrader/ICPFile'
Skipped missing target: 'NewInt5_MergeTracker/icp850/BSP/icp850init.c'
Skipped missing target: 'NewInt5_MergeTracker/icp850/BSP/quicc.h'
A    NewInt5_MergeTracker/appCommon/xml/DB-SM65.xml
Skipped missing target: 'NewInt5_MergeTracker/appCommon/Scripts/getFromVSS.bash'
U    NewInt5_MergeTracker/appCommon/icp/i18n/extractRootLDFs.xsl
U    NewInt5_MergeTracker/appCommon/icp/test/icp.prd
Skipped missing target: 'NewInt5_MergeTracker/appCommon/icp/control/control.h'
svn: Working copy 'NewInt5_MergeTracker/appCommon/icp/control' is missing or not locked

The "Skipped missing target" lines are expected, as a lot of files have moved around. I meant to go through all the skipped's one by one and redo the appropriate merges. But the error in the last line is not expected, nor should svn stop there.

Any suggestions?

Oh, the server is also svn 1.3.1 running under apache 2.2.0. (I.e. the stuff from the CSW archives.)

Sebastian Unger
Software Designer
-----------------------------------------------------------------------------
Powerware, 39 Princess St, PO Box 11-188
Christchurch 8030, New Zealand
Phone: (+64) 3 343-3314, Fax: (+64) 3 343-5100
E-mail: SebastianUnger@eaton.com
Website: www.powerware.com



---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: SVN 1.3.1 gives inexplicable error in merge

Posted by Lieven Govaerts <sv...@mobsol.be>.
SebastianUnger@eaton.com wrote:
> Hi, I'm trying to do a merge with svn 1.3.1 on a Solaris 10 machine and get the following error:
>
> bash-3.00$ svn co http://un-eng1/svn/sw/branches/users/sunger/NewInt5_MergeTracker
>
> ... lots of added files ...
>
> bash-3.00$ svn merge -r 3021:4320 http://un-eng1/svn/sw/branches/users/ppascoe/SC200Display NewInt5_MergeTracker                     
> Skipped missing target: 'NewInt5_MergeTracker/tools/host/host.prd'
> Skipped missing target: 'NewInt5_MergeTracker/tools/host/harness/displayManager.h'
> Skipped 'NewInt5_MergeTracker/tools/host/harness/sc200/translateDisplayBuffer.h'
> Skipped missing target: 'NewInt5_MergeTracker/tools/host/harness/sc200/sc200gui.h'
> Skipped missing target: 'NewInt5_MergeTracker/tools/host/harness/sc200/testBitmap.h'
> Skipped missing target: 'NewInt5_MergeTracker/tools/host/harness/sc200/sc200Gui.xd'
> Skipped 'NewInt5_MergeTracker/tools/host/harness/sc200/src/translateDisplayBuffer.c'
> Skipped missing target: 'NewInt5_MergeTracker/tools/host/harness/sc200/src/sc200displayBuffer.cc'
> Skipped missing target: 'NewInt5_MergeTracker/tools/host/harness/sc200/src/sc200events.c'
> Skipped missing target: 'NewInt5_MergeTracker/tools/host/harness/sc200/src/sc200gui.c'
> Skipped missing target: 'NewInt5_MergeTracker/tools/host/harness/sc200/src'
> Skipped missing target: 'NewInt5_MergeTracker/tools/host/harness/sc200/sc200displayBuffer.h'
> Skipped missing target: 'NewInt5_MergeTracker/tools/host/harness/sc200'
> Skipped missing target: 'NewInt5_MergeTracker/tools/host/harness/src/displayBuffer.cc'
> Skipped missing target: 'NewInt5_MergeTracker/tools/host/harness/src/displayManager.cc'
> Skipped missing target: 'NewInt5_MergeTracker/tools/host/harness/src'
> Skipped missing target: 'NewInt5_MergeTracker/tools/host/harness'
> Skipped missing target: 'NewInt5_MergeTracker/tools/host'
> Skipped missing target: 'NewInt5_MergeTracker/tools'
> Skipped missing target: 'NewInt5_MergeTracker/IcpUpgrader/Packager.cc'
> Skipped missing target: 'NewInt5_MergeTracker/IcpUpgrader/ICPFile/ICPFile.h'
> Skipped missing target: 'NewInt5_MergeTracker/IcpUpgrader/ICPFile'
> Skipped missing target: 'NewInt5_MergeTracker/icp850/BSP/icp850init.c'
> Skipped missing target: 'NewInt5_MergeTracker/icp850/BSP/quicc.h'
> A    NewInt5_MergeTracker/appCommon/xml/DB-SM65.xml
> Skipped missing target: 'NewInt5_MergeTracker/appCommon/Scripts/getFromVSS.bash'
> U    NewInt5_MergeTracker/appCommon/icp/i18n/extractRootLDFs.xsl
> U    NewInt5_MergeTracker/appCommon/icp/test/icp.prd
> Skipped missing target: 'NewInt5_MergeTracker/appCommon/icp/control/control.h'
> svn: Working copy 'NewInt5_MergeTracker/appCommon/icp/control' is missing or not locked
>
> The "Skipped missing target" lines are expected, as a lot of files have moved around. I meant to go through all the skipped's one by one and redo the appropriate merges. But the error in the last line is not expected, nor should svn stop there.
>
> Any suggestions?
>
> Oh, the server is also svn 1.3.1 running under apache 2.2.0. (I.e. the stuff from the CSW archives.)
>   
This looks like issue 2515:
http://subversion.tigris.org/issues/show_bug.cgi?id=2515

This issue is fixed in subversion 1.4.

Lieven.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org