Merging my doc test branch into doc-new

[Simon Ruderich]

On Sat, Nov 24, 2007 at 03:38:48AM -0600, Ryan Schmidt wrote:
>
> 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?

Hi Ryan

> 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:

Oh, this was my problem, I didn't use the correct revision because I didn't
looked at the first copy. Thanks for your help.

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

I just committed the merge, thanks again for your help.

Simon
-- 
+ privacy is necessary
+ using http://gnupg.org
+ public key id: 0x6115F804EFB33229
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 186 bytes
Desc: not available
Url : http://lists.macosforge.org/pipermail/macports-dev/attachments/20071124/68ba51e5/attachment.bin