svn switch problems
Hello, I'm trying to do an svn switch and keep getting an error: svn switch https://.../services/branches/ementor . svn: Directory 'ementor' is missing svn: Directory 'ementor' is missing [hostname]$ The directory is currently switched to the trunk. The trunk has no ementor directory. There is an ementor directory in the ementor branch. Why doesn't svn create the ementor directory, since that directory is in the branch I'm switching to? I tried an svn cleanup, but that didn't work, I still got the error. Thanks, Doug
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
RE: svn merge help
The changes are included in the services branch, but not in the online branch. I want to take changes from one branch (services) and apply them to the other (online). - Doug From: John Maher [mailto:jo...@rotair.com] Sent: Tuesday, August 28, 2012 4:08 PM To: Douglass Davis; users@subversion.apache.org Subject: 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:dda...@northcarolina.edu]<mailto:[mailto:dda...@northcarolina.edu]> Sent: Tuesday, August 28, 2012 3:55 PM To: users@subversion.apache.org<mailto:users@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
RE: svn merge help
Nevermind. It was a simple mistake. I just had the revision numbers wrong, and it was (correctly) not merging any code from revisions before the branch. - Doug From: Douglass Davis [mailto:dda...@northcarolina.edu] Sent: Tuesday, August 28, 2012 3:55 PM To: users@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
