What's wrong is that you can't do 'smart merging' (i.e. 'svn merge --reintegrate') unless the server is svn 1.5. The googlecode server is 1.4 right now, but we'll be upgrading to 1.5 very soon.
So you'll need to do the more 'manual' merging procedures -- see the svn 1.4 book for explanations. On Tue, Dec 16, 2008 at 2:35 PM, Goofy <[email protected]> wrote: > > Hello! > > This is my projest: http://code.google.com/p/snllibrary/ > > I have problem with my repository. I'm unable to merge code from > branch back to trunk. Maybe I broke something? Here is what i did. > > First I removed everything from svn (trunk, branches and tags > folders). > revision 219: I imported new code to trunk. > revision 220: I marked code in trunk wit tag '1.0.1' > revision 221: I created new branch '2.0experimental' from trunk > revision 222: I made some changes in branch '2.0experimental' and > commited them to repository > revision 223: I made some small changes in trunk and commited changes > revision 224: I merged my local working copy with latest changes in > trunk, and commited merged code to repository > > Now I wanted to merge back branch '2.0experimental' to trunk. First I > run 'svn update' in my working copy of trunk, and then I run this > command: > go...@goofy-desktop:~/Desktop/snllib$ svn merge --reintegrate > https://snllibrary.googlecode.com/svn/branches/2.0experimental > > svn returned this error: Obtaining information about changes > connections unsupported by 'https://snllibrary.googlecode.com/svn' > > What's wrong? Did I broke something? Maybe I incorrectly manage mu > repository? > > > --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Hosting at Google Code" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/google-code-hosting?hl=en -~----------~----~----~----~------~----~------~--~---
