Merging my doc test branch into doc-new

[Ryan Schmidt]

On Nov 23, 2007, at 15:59, Simon Ruderich wrote:

> as Mark and I think the doc test branch is ready, I tried to merge  
> it back
> into doc-new. But I had no success.
>
> I tried it with "svn merge -r 31208:31436
> http://svn.macports.org/repository/macports/branches/simon-doc-test/ 
> doc-new".
>
> What am I doing wrong?

r31208 is not the revision in which the branch was created, but the  
revision in which you renamed it from /trunk/doc-new-test to / 
branches/simon-doc-test/doc-new. Maybe you were using "svn log --stop- 
on-copy" on your branch? If so, it stopped at the point where you  
copied it from the doc-new-test name in trunk, not the point where  
you originally copied it from doc-new. Looking further back in the  
log, it looks like the branch was actually created from doc-new in  
r31176 so you probably want to merge from revision 31176 to 31436.  
And of course you'll need to be in a working copy of doc-new from  
trunk to do this. This works for me:

$ cd trunk/doc-new
$ svn merge -r 31176:31436 http://svn.macosforge.org/repository/ 
macports/branches/simon-doc-test/doc-new
D    man/xml/portfile-global.7.xml
D    man/xml/portfile-phase.7.xml
D    man/xml/portfile-startupitem.7.xml
D    man/xml/portfile-tcl.7.xml
U    man/xml/portfile.7.xml
U    Makefile
U    guide/xml/portfileref.xml
A    guide/xml/portfile-phase.7.xml
A    guide/xml/portfile-startupitem.7.xml
A    guide/xml/portfile-tcl.7.xml
A    guide/xml/portfile-global-keywords.7.xml
A    guide/xml/portfile-global-variables.7.xml
$

I didn't commit this of course; I'll leave that to you. I just wanted  
to make sure the merge command was right.