[Svnmerge] how to merge a single branch revision back into trunk?

Tue Oct 17 08:40:24 PDT 2006

Hi,

I'm trying to merge changes in a branch (1.0.x) back into trunk.    
The output from "svnmerge avail -l -S 1.0.x" in the trunk directory  
is below.  If I try to merge all of the changes at once via the  
"svnmerge merge -b -S 1.0.x" command, I get an "svnmerge: command  
execution failed (exit code: 1)" error message (for details, see  
immediately preceding email from me with the error message as  
subject).  As a workaround, I'm trying to merge the changes in the  
branch  individually.

However, if I try to merge a single revision, I get the following  
error message:

crasch:~/Projects/trunk crasch$ svnmerge merge -b -S 1.0.x r12313
svnmerge: "r12313" is not a subversion working directory

How do I merge a single branch revision back into trunk?

Thanks!

Chris

crasch:~/Projects/trunk crasch$ svnmerge avail -l -S 1.0.x
------------------------------------------------------------------------
r12313 | crasch | 2006-09-28 14:43:26 -0400 (Thu, 28 Sep 2006) | 9 lines
Changed paths:
    M /main/branches/release/1.0.x
    M /main/branches/release/1.0.x/Configuration/parcel/post_install

Merged revisions 12311 via svnmerge from
svn+ssh://svn.marketocracy.com/svn/repo/main/trunk

........
   r12311 | crasch | 2006-09-28 14:13:22 -0400 (Thu, 28 Sep 2006) | 1  
line

   Correct typo
........

------------------------------------------------------------------------
r12317 | crasch | 2006-09-29 11:39:34 -0400 (Fri, 29 Sep 2006) | 2 lines
Changed paths:
    M /main/branches/release/1.0.x/WOApps/Portfolio/ 
ManagerMPointsPage.wo/ManagerMPointsPage.html

Add toll-free number to mPoints page.

------------------------------------------------------------------------
r12319 | crasch | 2006-10-02 14:20:29 -0400 (Mon, 02 Oct 2006) | 1 line
Changed paths:
    M /main/branches/release/1.0.x/mbuild/tools

Add cahelper to the list of tools to build/deploy

------------------------------------------------------------------------
r12322 | crasch | 2006-10-02 18:42:02 -0400 (Mon, 02 Oct 2006) | 2 lines
Changed paths:
    M /main/branches/release/1.0.x/mbuild/tools

Actually, cahelper was already in the file, so removing duplicate

------------------------------------------------------------------------
r12330 | crasch | 2006-10-09 16:49:22 -0400 (Mon, 09 Oct 2006) | 1 line
Changed paths:
    A /main/branches/release/1.0.x/Scripts/admin/reverseCA.py

Add help message to reversCA.py
------------------------------------------------------------------------
r12331 | crasch | 2006-10-09 16:53:06 -0400 (Mon, 09 Oct 2006) | 1 line
Changed paths:
    A /main/branches/release/1.0.x/Scripts/admin/deleteMStockAlias.py

Add script for deleting mstockalias record
------------------------------------------------------------------------
r12332 | crasch | 2006-10-10 14:37:30 -0400 (Tue, 10 Oct 2006) | 1 line
Changed paths:
    A /main/branches/release/1.0.x/Scripts/admin/deleteRecord.py

Given a tablename, and primarykey, deletes the row from that table  
(assuming that there are no foreign key constraints)

------------------------------------------------------------------------
r12338 | crasch | 2006-10-12 10:35:59 -0400 (Thu, 12 Oct 2006) | 1 line
Changed paths:
    A /main/branches/release/1.0.x/Configuration/Marketocracy/ 
Marketocracy.unittest.cfg

Config file needed for some Python unit tests

------------------------------------------------------------------------
r12341 | crasch | 2006-10-16 11:16:24 -0400 (Mon, 16 Oct 2006) | 1 line
Changed paths:
    M /main/branches/release/1.0.x/Configuration/Marketocracy/ 
spread.conf.testbank

remove references to non-existent machines
------------------------------------------------------------------------
r12342 | crasch | 2006-10-16 14:14:48 -0400 (Mon, 16 Oct 2006) | 1 line
Changed paths:
    A /main/branches/release/1.0.x/OldScripts/deleteRecord.sh

script to delete a record from any Marketocracy db table
------------------------------------------------------------------------
r12343 | crasch | 2006-10-16 14:41:13 -0400 (Mon, 16 Oct 2006) | 2 lines
Changed paths:
    A /main/branches/release/1.0.x/Scripts/admin/updateRecord.sh

Allows one to update any row in Marketocracy db

------------------------------------------------------------------------
r12344 | crasch | 2006-10-16 14:47:52 -0400 (Mon, 16 Oct 2006) | 1 line
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)

remove old python table edit scripts
------------------------------------------------------------------------
r12345 | crasch | 2006-10-16 16:16:01 -0400 (Mon, 16 Oct 2006) | 1 line
Changed paths:
    M /main/branches/release/1.0.x/Scripts/admin/deleteRecord.sh
    M /main/branches/release/1.0.x/Scripts/admin/updateRecord.sh

handle updating a key field; formatting changes
------------------------------------------------------------------------
r12346 | crasch | 2006-10-16 16:30:08 -0400 (Mon, 16 Oct 2006) | 1 line
Changed paths:
    M /main/branches/release/1.0.x/Scripts/admin/updateRecord.sh

more formatting changes
------------------------------------------------------------------------
r12347 | crasch | 2006-10-17 09:52:14 -0400 (Tue, 17 Oct 2006) | 1 line
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/deleteRecord.py:12332)
    D /main/branches/release/1.0.x/OldScripts/deleteRecord.sh

Update python login script, add python deleteRecord script, update  
remote command execution script