[Zope3-checkins] Re: [Checkins] SVN: relstorage/trunk/ Merged changes from the 1.1 branch.

Stephan Richter srichter at cosmos.phy.tufts.edu
Sat May 10 12:36:42 EDT 2008


On Friday 09 May 2008, Shane Hathaway wrote:
>   This is my first try at merging in Subversion.  Is it really this hard?
>   This is how I did it:
>  
>     svn merge -r 85842:86602 ../branches/1.1 .
>  
>   Figuring out those revision numbers was complicated.

Yes. :-( Except that the final revision could have been HEAD. There need to be 
more of those special revision names around. For example the revision you 
started the branch on, call it CREATED; then it would be easy:

svn merge -r CREATED:HEAD ../branches/1.1

Regards,
Stephan
-- 
Stephan Richter
Web Software Design, Development and Training
Google me. "Zope Stephan Richter"


More information about the Zope3-Checkins mailing list