On 10/17/06, Christopher Rasch <[EMAIL PROTECTED]> wrote: > Environment: Python 2.4.3 on Mac OS X Tiger 10.4.7 > > Our svn repository has a single branch (1.0.x ). I'm trying to merge the > changes to the 1.0.x branch back into the trunk repository. However, when I > do so, I get the following error: > > crasch:~/Projects/trunk crasch$ svnmerge merge -b -S 1.0.x > svnmerge: command execution failed (exit code: 1) > svn log --verbose --quiet -r12312:12347 > "svn+ssh://svn.marketocracy.com/svn/repo/main/branches/release/1.0.x" > ------------------------------------------------------------------------ > r12313 | crasch | 2006-09-28 14:43:26 -0400 (Thu, 28 Sep 2006) > Changed paths: > M /main/branches/release/1.0.x > M > /main/branches/release/1.0.x/Configuration/parcel/post_install > ------------------------------------------------------------------------ > r12317 | crasch | 2006-09-29 11:39:34 -0400 (Fri, 29 Sep 2006) > Changed paths: > M > /main/branches/release/1.0.x/WOApps/Portfolio/ManagerMPointsPage.wo/ManagerMPointsPage.html > ------------------------------------------------------------------------ > r12319 | crasch | 2006-10-02 14:20:29 -0400 (Mon, 02 Oct 2006) > Changed paths: > M /main/branches/release/1.0.x/mbuild/tools > ------------------------------------------------------------------------ > r12322 | crasch | 2006-10-02 18:42:02 -0400 (Mon, 02 Oct 2006) > Changed paths: > M /main/branches/release/1.0.x/mbuild/tools > ------------------------------------------------------------------------ > r12330 | crasch | 2006-10-09 16:49:22 -0400 (Mon, 09 Oct 2006) > Changed paths: > A > /main/branches/release/1.0.x/Scripts/admin/reverseCA.py > ------------------------------------------------------------------------ > r12331 | crasch | 2006-10-09 16:53:06 -0400 (Mon, 09 Oct 2006) > Changed paths: > A > /main/branches/release/1.0.x/Scripts/admin/deleteMStockAlias.py > ------------------------------------------------------------------------ > r12332 | crasch | 2006-10-10 14:37:30 -0400 (Tue, 10 Oct 2006) > Changed paths: > A > /main/branches/release/1.0.x/Scripts/admin/deleteRecord.py > ------------------------------------------------------------------------ > r12338 | crasch | 2006-10-12 10:35:59 -0400 (Thu, 12 Oct 2006) > Changed paths: > A > /main/branches/release/1.0.x/Configuration/Marketocracy/Marketocracy.unittest.cfg > ------------------------------------------------------------------------ > r12341 | crasch | 2006-10-16 11:16:24 -0400 (Mon, 16 Oct 2006) > Changed paths: > M > /main/branches/release/1.0.x/Configuration/Marketocracy/spread.conf.testbank > ------------------------------------------------------------------------ > r12342 | crasch | 2006-10-16 14:14:48 -0400 (Mon, 16 Oct 2006) > Changed paths: > A > /main/branches/release/1.0.x/OldScripts/deleteRecord.sh > ------------------------------------------------------------------------ > r12343 | crasch | 2006-10-16 14:41:13 -0400 (Mon, 16 Oct 2006) > Changed paths: > A > /main/branches/release/1.0.x/Scripts/admin/updateRecord.sh > ------------------------------------------------------------------------ > r12344 | crasch | 2006-10-16 14:47:52 -0400 (Mon, 16 Oct 2006) > Changed paths: > D > /main/branches/release/1.0.x/Scripts/admin/deleteMStockAlias.py > D > /main/branches/release/1.0.x/Scripts/admin/deleteRecord.py > A > /main/branches/release/1.0.x/Scripts/admin/deleteRecord.sh > (from > /main/branches/release/1.0.x/OldScripts/deleteRecord.sh:12342) > ------------------------------------------------------------------------ > r12345 | crasch | 2006-10-16 16:16:01 -0400 (Mon, 16 Oct 2006) > Changed paths: > M > /main/branches/release/1.0.x/Scripts/admin/deleteRecord.sh > M > /main/branches/release/1.0.x/Scripts/admin/updateRecord.sh > ------------------------------------------------------------------------ > r12346 | crasch | 2006-10-16 16:30:08 -0400 (Mon, 16 Oct 2006) > Changed paths: > M > /main/branches/release/1.0.x/Scripts/admin/updateRecord.sh > ------------------------------------------------------------------------ > r12347 | crasch | 2006-10-17 09:52:14 -0400 (Tue, 17 Oct 2006) > Changed paths: > M > /main/branches/release/1.0.x/DeployScripts/executeRemoteCommand.rb > M > /main/branches/release/1.0.x/OldScripts/Python/FrontBase.py > M > /main/branches/release/1.0.x/OldScripts/Python/PortfolioTests/MPageRecognitionTests.py > M > /main/branches/release/1.0.x/OldScripts/Python/PortfolioTests/login.py > M > /main/branches/release/1.0.x/OldScripts/Python/PortfolioTests/mpr.py > A > /main/branches/release/1.0.x/OldScripts/Python/PortfolioTests/test_html/waitcursor.html > A > /main/branches/release/1.0.x/OldScripts/Python/deleteRecord.py > (from /main/branches/release/1.0.x/Scripts/admin/del > > This appears to be related to another error a coworker of mine reported > earlier: > > http://www.orcaware.com/pipermail/svnmerge/2006-August/000678.html > > Unfortunately, Mike was hired by another company, so I don't know how the > issue was ultimately resolved, if it was. This appears to be the last > message in the archives regarding the issue: > > http://www.orcaware.com/pipermail/svnmerge/2006-August/000680.html > > Anyone have any suggestions for how I can work around this issue?
A hack I did is: < if os.name not in ['nt', 'os2']: --- > if os.name not in ['nt', 'os2', 'posix']: This forces the script to use the 'NT way' of spawning the process instead of the posix way. This seems to get around the bug. _______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
