Suppose I'm working on a branch which resides at /branches/my_branch and want to merge changes from /trunk. I have a working copy for the branch only — since it was checked out with Versions, the URL (from `svn info`) is "http://[email protected]/svn/branches/my_branch";. To merge changes made to trunk directly from the server, I'd do the following:
$ svn merge http://example.com/svn/trunk working-copy-path This results in a merge failure and the following SVN error: svn: 'http://[email protected]/svn/branches/my_branch' isn't in the same repository as 'http://example.com/svn/trunk' Although you might well argue that SVN should be smart enough to figure out that the presence or absence of a username shouldn't cause the URLs to be different, the fact is that it does. It is impossible to merge unless you either (1) include the username in the URL provided to svn merge, or (2) svn switch --relocate the working copy to eliminate the username from the path. Not having the username in the URL in the first place would be vastly preferable. - Quinn On Nov 29, 2010, at 9:22 PM, Alex Zavatone wrote: > Please give an example of how you are doing it. > > > On Nov 29, 2010, at 6:05 PM, Jay wrote: > >> Hi there, >> >> We are using Versions in a team of 7+ and it's been pretty good so >> far, thanks for a great product. >> >> One thing that it stumbles on though is adding the username to the url >> of a working copy. Merging branches is problematic because the actual >> url that doesn't have the username doesn't actually have any history. >> Many on our team (like myself) resort to Terminal to merge branches, >> but some are starting to use other software, like SyncroSVN. I'd >> prefer to stick with Versions because I like the interface - any >> chance of a fix for this? >> >> Jay >> >> -- >> You received this message because you are subscribed to the Google Groups >> "Versions" 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/versions?hl=en. >> > > -- > You received this message because you are subscribed to the Google Groups > "Versions" 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/versions?hl=en. >
smime.p7s
Description: S/MIME cryptographic signature
