RE: svn merge help

I can be wrong because I'm struggling with this myself, but shouldn't
rev 9995 already include all the prior changes?

JPM

________________________________

From: Douglass Davis [mailto:ddavis_at_northcarolina.edu]
Sent: Tuesday, August 28, 2012 3:55 PM
To: users_at_subversion.apache.org
Subject: svn merge help

Hi,

Client is svn, version 1.6.11 (r934486)

I read the manual, but I'm not sure what I'm doing wrong.

I copied https://mydomain/services/trunk (services) to
https://mydomain/online/trunk (online) at revision 9884.

There were several bugfixes made on services that I wanted to put in
online. Some I just edited the code manually in my working copy of
online.

Right now, what I would like to do is just take the changes from
revisions 9938 up to and including 9995 (about 20 revisions) from
services (https://mydomain/services/trunk), and apply those to online
(https://mydomain/online/trunk).

So, I go to my working copy of online. I have tried this:

svn merge -r 9937:9996 https://mydomain/services/trunk .

And that just gives me the changes from revision 9995 of services.

I revert, then tried

svn merge https://svn.northcarolina.edu/os/cms/apps/services/trunk@9937
https://svn.northcarolina.edu/os/cms/apps/services/trunk@9995 .

And still it only gave me the changes from 9995.

How do I get all changes from 9937-9995 (inclusive) and apply them to my
working copy of online?

Thanks,

Doug

 
Received on 2012-08-28 22:09:42 CEST