[Adium-devl] Merging Branches

[Peter Hosey]

On Sep 06, 2007, at 19:41:22, Augie Fackler wrote:
> Here's the recipe I came up with for merging SoC branches to trunk:
>
> cd $BRANCH_WC
> svn merge -r 20789:HEAD svn://svn.adiumx.com/adium/trunk
> # Build - test anything needed (applescript branch should have unit
> tests run)
> cd $TRUNK_WC
> svn merge svn://svn.adiumx.com/adium/trunk \
>   svn://svn.adiumx.com/adium/branches/summer_of_code_2007/bonjour
> # Build - test anything needed (redundant - the code here should  
> now be
> # identical to the code present in the branch).

This is where an incomplete complete WC is handy. Here's how the  
process would work with such a WC:

cd  
$adiumdir                                                              % 
~(0)
___
                                      %~/Projects/ 
@otherpeoplesprojects/adium(0)
___
cd br/2007[tab]b[tab] # zshcompsys helping out with that — result is  
branches/summer_of_code_2007/bonjour
___
svn merge -r20789:HEAD ../../../trunk
___
xcodebuild -configuration Deployment
___
svn ci # I presume you missed or elided this step
___
cd ../../../trunk
___
svn merge ~+1 # The previous working directory, i.e., the branch
___
xcodebuild -configuration Deployment
___
svn ci

[The xterm transcript you have just witnessed is a reenactment. No  
animals were harmed in the making of this transcript. RPS1 and  
zshcompsys and WD history FTW.]

-------------- next part --------------
A non-text attachment was scrubbed...
Name: PGP.sig
Type: application/pgp-signature
Size: 186 bytes
Desc: This is a digitally signed message part
URL: <http://adium.im/pipermail/devel_adium.im/attachments/20070906/db9d57ee/attachment.sig>